commit ebde3c1e1e87202d6c81a7351921468703be7b6f
author Vitaly Buka <vitalybuka@google.com> Tue Feb 23 18:50:42 2016 -0800
committer Vitaly Buka <vitalybuka@google.com> Wed Feb 24 18:13:14 2016 +0000
tree 335435626c63af0194fd9a00d4e525aa6b2ae32a
parent efbd66b690afb9c91ea95f91e216667901191746

Rename *BlackList* into *Revocation*

This name matches better new trait and semantic.

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

src/privet/auth_manager.cc

diff --git a/src/privet/auth_manager.cc b/src/privet/auth_manager.cc
index ddead46..d905a45 100644
--- a/src/privet/auth_manager.cc
+++ b/src/privet/auth_manager.cc
@@ -11,7 +11,7 @@
 #include <base/rand_util.h>
 #include <base/strings/string_number_conversions.h>
 
-#include "src/access_black_list_manager.h"
+#include "src/access_revocation_manager.h"
 #include "src/config.h"
 #include "src/data_encoding.h"
 #include "src/privet/constants.h"
@@ -269,7 +269,7 @@
 }  // namespace
 
 AuthManager::AuthManager(Config* config,
-                         AccessBlackListManager* black_list,
+                         AccessRevocationManager* black_list,
                          const std::vector<uint8_t>& certificate_fingerprint)
     : config_{config},
       black_list_{black_list},
@@ -291,7 +291,7 @@
                          const std::vector<uint8_t>& certificate_fingerprint,
                          const std::vector<uint8_t>& access_secret,
                          base::Clock* clock,
-                         AccessBlackListManager* black_list)
+                         AccessRevocationManager* black_list)
     : AuthManager(nullptr, black_list, certificate_fingerprint) {
   access_secret_ = access_secret.size() == kSha256OutputSize ? access_secret
                                                              : CreateSecret();

src/privet/auth_manager.h

diff --git a/src/privet/auth_manager.h b/src/privet/auth_manager.h
index 83899da..d8174f6 100644
--- a/src/privet/auth_manager.h
+++ b/src/privet/auth_manager.h
@@ -19,7 +19,7 @@
 
 namespace weave {
 
-class AccessBlackListManager;
+class AccessRevocationManager;
 class Config;
 enum class RootClientTokenOwner;
 
@@ -28,7 +28,7 @@
 class AuthManager {
  public:
   AuthManager(Config* config,
-              AccessBlackListManager* black_list,
+              AccessRevocationManager* black_list,
               const std::vector<uint8_t>& certificate_fingerprint);
 
   // Constructor for tests.
@@ -36,7 +36,7 @@
               const std::vector<uint8_t>& certificate_fingerprint,
               const std::vector<uint8_t>& access_secret,
               base::Clock* clock = nullptr,
-              AccessBlackListManager* black_list = nullptr);
+              AccessRevocationManager* black_list = nullptr);
   ~AuthManager();
 
   std::vector<uint8_t> CreateAccessToken(const UserInfo& user_info,
@@ -86,7 +86,7 @@
                                       const UserInfo& user_info) const;
 
   Config* config_{nullptr};  // Can be nullptr for tests.
-  AccessBlackListManager* black_list_{nullptr};
+  AccessRevocationManager* black_list_{nullptr};
   base::DefaultClock default_clock_;
   base::Clock* clock_{&default_clock_};
   mutable uint32_t session_counter_{0};

src/privet/auth_manager_unittest.cc

diff --git a/src/privet/auth_manager_unittest.cc b/src/privet/auth_manager_unittest.cc
index f2c8728..648027d 100644
--- a/src/privet/auth_manager_unittest.cc
+++ b/src/privet/auth_manager_unittest.cc
@@ -11,7 +11,7 @@
 #include "src/config.h"
 #include "src/data_encoding.h"
 #include "src/privet/mock_delegates.h"
-#include "src/test/mock_black_list_manager.h"
+#include "src/test/mock_access_revocation_manager.h"
 #include "src/test/mock_clock.h"
 
 using testing::_;
@@ -22,9 +22,9 @@
 namespace weave {
 namespace privet {
 
-class MockBlackListManager : public test::MockAccessBlackListManager {
+class MockAccessRevocationManager : public test::MockAccessRevocationManager {
  public:
-  MockBlackListManager() {
+  MockAccessRevocationManager() {
     EXPECT_CALL(*this, AddEntryAddedCallback(_))
         .WillOnce(SaveArg<0>(&changed_callback_));
     EXPECT_CALL(*this, IsBlocked(_, _, _)).WillRepeatedly(Return(false));
@@ -61,7 +61,7 @@
       60, 62, 10, 18, 82, 35, 88, 100, 30, 45, 7, 46, 67, 84, 58, 85};
 
   test::MockClock clock_;
-  StrictMock<MockBlackListManager> black_list_;
+  StrictMock<MockAccessRevocationManager> black_list_;
   AuthManager auth_{kSecret1, kFingerprint, kSecret2, &clock_, &black_list_};
 };