SyncManagerImpl::encryptor_ member is not needed. It is passed to SyncEncryptionHandlerImpl and never used in SyncManagerImpl.

OnInvalidationCredentialsRejected is not used anywhere.

R=zea@chromium.org

Review URL: https://codereview.chromium.org/223553009

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@261636 0039d316-1c4b-4281-b951-d872f2087c98

4 files changed, 0 insertions, 15 deletions

diff --git a/sync/engine/net/server_connection_manager.cc b/sync/engine/net/server_connection_manager.cc
index 2cb7810..3101109 100644
--- a/sync/engine/net/server_connection_manager.cc
+++ b/sync/engine/net/server_connection_manager.cc
@@ -244,11 +244,6 @@ bool ServerConnectionManager::SetAuthToken(const std::string& auth_token) {
   return false;
 }
 
-void ServerConnectionManager::OnInvalidationCredentialsRejected() {
-  InvalidateAndClearAuthToken();
-  SetServerStatus(HttpResponse::SYNC_AUTH_ERROR);
-}
-
 void ServerConnectionManager::InvalidateAndClearAuthToken() {
   DCHECK(thread_checker_.CalledOnValidThread());
   // Copy over the token to previous invalid token.
diff --git a/sync/engine/net/server_connection_manager.h b/sync/engine/net/server_connection_manager.h
index e6a48f0..c081f8e 100644
--- a/sync/engine/net/server_connection_manager.h
+++ b/sync/engine/net/server_connection_manager.h
@@ -228,13 +228,6 @@ class SYNC_EXPORT_PRIVATE ServerConnectionManager : public CancelationObserver {
   // Sets a new auth token and time.
   bool SetAuthToken(const std::string& auth_token);
 
-  // Our out-of-band invalidations channel can encounter auth errors,
-  // and when it does so it tells us via this method to prevent making more
-  // requests with known-bad tokens. This will put the
-  // ServerConnectionManager in an auth error state as if it received an
-  // HTTP 401 from sync servers.
-  void OnInvalidationCredentialsRejected();
-
   bool HasInvalidAuthToken() {
     return auth_token_.empty();
   }
diff --git a/sync/internal_api/sync_manager_impl.cc b/sync/internal_api/sync_manager_impl.cc
index 0255522..65d6176db 100644
--- a/sync/internal_api/sync_manager_impl.cc
+++ b/sync/internal_api/sync_manager_impl.cc
@@ -168,7 +168,6 @@ SyncManagerImpl::SyncManagerImpl(const std::string& name)
       initialized_(false),
       observing_network_connectivity_changes_(false),
       invalidator_state_(DEFAULT_INVALIDATION_ERROR),
-      encryptor_(NULL),
       report_unrecoverable_error_function_(NULL),
       weak_ptr_factory_(this) {
   // Pre-fill |notification_info_map_|.
@@ -349,7 +348,6 @@ void SyncManagerImpl::Init(
 
   database_path_ = database_location.Append(
       syncable::Directory::kSyncDatabaseFilename);
-  encryptor_ = encryptor;
   unrecoverable_error_handler_ = unrecoverable_error_handler.Pass();
   report_unrecoverable_error_function_ = report_unrecoverable_error_function;
 
diff --git a/sync/internal_api/sync_manager_impl.h b/sync/internal_api/sync_manager_impl.h
index 7386e01..f73a89d 100644
--- a/sync/internal_api/sync_manager_impl.h
+++ b/sync/internal_api/sync_manager_impl.h
@@ -361,7 +361,6 @@ class SYNC_EXPORT_PRIVATE SyncManagerImpl :
 
   ProtocolEventBuffer protocol_event_buffer_;
 
-  Encryptor* encryptor_;
   scoped_ptr<UnrecoverableErrorHandler> unrecoverable_error_handler_;
   ReportUnrecoverableErrorFunction report_unrecoverable_error_function_;