commit 4846c44914d563a76ac7b97f8917928cd2c054ce
author Vitaly Buka <vitalybuka@google.com> Tue Feb 23 14:55:33 2016 -0800
committer Vitaly Buka <vitalybuka@google.com> Wed Feb 24 18:11:02 2016 +0000
tree 7394f465cba1846e824d01c3ab71b2f8232c6187
parent 958a3599ebf1667dcdf4a32e9daa2e975ba4dbfc

Remove AccessBlackListManager::Unblock

BUG: 27313743
Change-Id: I19b06bded3ae9b14dec156380d25a05c9957a8ea
Reviewed-on: https://weave-review.googlesource.com/2726
Reviewed-by: Alex Vakulenko <avakulenko@google.com>

src/access_black_list_manager.h

diff --git a/src/access_black_list_manager.h b/src/access_black_list_manager.h
index 1184f16..eb3f06a 100644
--- a/src/access_black_list_manager.h
+++ b/src/access_black_list_manager.h
@@ -31,9 +31,6 @@
                      const std::vector<uint8_t>& app_id,
                      const base::Time& expiration,
                      const DoneCallback& callback) = 0;
-  virtual void Unblock(const std::vector<uint8_t>& user_id,
-                       const std::vector<uint8_t>& app_id,
-                       const DoneCallback& callback) = 0;
   virtual bool IsBlocked(const std::vector<uint8_t>& user_id,
                          const std::vector<uint8_t>& app_id) const = 0;
   virtual std::vector<Entry> GetEntries() const = 0;

src/access_black_list_manager_impl.cc

diff --git a/src/access_black_list_manager_impl.cc b/src/access_black_list_manager_impl.cc
index a57ca36..3a54073 100644
--- a/src/access_black_list_manager_impl.cc
+++ b/src/access_black_list_manager_impl.cc
@@ -124,22 +124,6 @@
   Save(callback);
 }
 
-void AccessBlackListManagerImpl::Unblock(const std::vector<uint8_t>& user_id,
-                                         const std::vector<uint8_t>& app_id,
-                                         const DoneCallback& callback) {
-  if (!entries_.erase(std::make_pair(user_id, app_id))) {
-    if (!callback.is_null()) {
-      ErrorPtr error;
-      Error::AddTo(&error, FROM_HERE, "entry_not_found", "Unknown entry");
-      callback.Run(std::move(error));
-    }
-    return;
-  }
-  // Iterating is OK as Save below is more expensive.
-  RemoveExpired();
-  Save(callback);
-}
-
 bool AccessBlackListManagerImpl::IsBlocked(
     const std::vector<uint8_t>& user_id,
     const std::vector<uint8_t>& app_id) const {

src/access_black_list_manager_impl.h

diff --git a/src/access_black_list_manager_impl.h b/src/access_black_list_manager_impl.h
index 646d748..e41a93a 100644
--- a/src/access_black_list_manager_impl.h
+++ b/src/access_black_list_manager_impl.h
@@ -29,9 +29,6 @@
              const std::vector<uint8_t>& app_id,
              const base::Time& expiration,
              const DoneCallback& callback) override;
-  void Unblock(const std::vector<uint8_t>& user_id,
-               const std::vector<uint8_t>& app_id,
-               const DoneCallback& callback) override;
   bool IsBlocked(const std::vector<uint8_t>& user_id,
                  const std::vector<uint8_t>& app_id) const override;
   std::vector<Entry> GetEntries() const override;

src/access_black_list_manager_impl_unittest.cc

diff --git a/src/access_black_list_manager_impl_unittest.cc b/src/access_black_list_manager_impl_unittest.cc
index 0e7c0e0..0f21c3e 100644
--- a/src/access_black_list_manager_impl_unittest.cc
+++ b/src/access_black_list_manager_impl_unittest.cc
@@ -115,23 +115,6 @@
                   }));
 }
 
-TEST_F(AccessBlackListManagerImplTest, Unblock) {
-  EXPECT_CALL(config_store_, SaveSettings("black_list", _, _))
-      .WillOnce(testing::WithArgs<1, 2>(testing::Invoke(
-          [](const std::string& json, const DoneCallback& callback) {
-            EXPECT_JSON_EQ("[]", *test::CreateValue(json));
-            if (!callback.is_null())
-              callback.Run(nullptr);
-          })));
-  manager_->Unblock({1, 2, 3}, {3, 4, 5}, {});
-}
-
-TEST_F(AccessBlackListManagerImplTest, UnblockNotFound) {
-  manager_->Unblock({5, 2, 3}, {5, 4, 5}, base::Bind([](ErrorPtr error) {
-                      EXPECT_TRUE(error->HasError("entry_not_found"));
-                    }));
-}
-
 TEST_F(AccessBlackListManagerImplTest, IsBlockedFalse) {
   EXPECT_FALSE(manager_->IsBlocked({7, 7, 7}, {8, 8, 8}));
 }

src/test/mock_black_list_manager.h

diff --git a/src/test/mock_black_list_manager.h b/src/test/mock_black_list_manager.h
index f028953..6b55b86 100644
--- a/src/test/mock_black_list_manager.h
+++ b/src/test/mock_black_list_manager.h
@@ -21,10 +21,6 @@
                     const std::vector<uint8_t>&,
                     const base::Time&,
                     const DoneCallback&));
-  MOCK_METHOD3(Unblock,
-               void(const std::vector<uint8_t>&,
-                    const std::vector<uint8_t>&,
-                    const DoneCallback&));
   MOCK_CONST_METHOD2(IsBlocked,
                      bool(const std::vector<uint8_t>&,
                           const std::vector<uint8_t>&));