Remove most remaining sync/notifier dependencies

sync/internal_api/sync_manager_impl.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "sync/internal_api/sync_manager_impl.h"
 
 #include <string>
 
 #include "base/base64.h"
 #include "base/bind.h"
@@ skipping 20 matching lines @@
 #include "sync/internal_api/public/read_transaction.h"
 #include "sync/internal_api/public/sync_context.h"
 #include "sync/internal_api/public/sync_context_proxy.h"
 #include "sync/internal_api/public/user_share.h"
 #include "sync/internal_api/public/util/experiments.h"
 #include "sync/internal_api/public/write_node.h"
 #include "sync/internal_api/public/write_transaction.h"
 #include "sync/internal_api/sync_context_proxy_impl.h"
 #include "sync/internal_api/syncapi_internal.h"
 #include "sync/internal_api/syncapi_server_connection_manager.h"
-#include "sync/notifier/invalidation_util.h"
-#include "sync/notifier/invalidator.h"
-#include "sync/notifier/object_id_invalidation_map.h"
 #include "sync/protocol/proto_value_conversions.h"
 #include "sync/protocol/sync.pb.h"
 #include "sync/sessions/directory_type_debug_info_emitter.h"
 #include "sync/syncable/directory.h"
 #include "sync/syncable/entry.h"
 #include "sync/syncable/in_memory_directory_backing_store.h"
 #include "sync/syncable/on_disk_directory_backing_store.h"
 
 using base::TimeDelta;
 using sync_pb::GetUpdatesCallerInfo;
@@ skipping 108 matching lines @@
     }
     return delay;
   }
 };
 
 SyncManagerImpl::SyncManagerImpl(const std::string& name)
     : name_(name),
       change_delegate_(NULL),
       initialized_(false),
       observing_network_connectivity_changes_(false),
-      invalidator_state_(DEFAULT_INVALIDATION_ERROR),
       report_unrecoverable_error_function_(NULL),
       weak_ptr_factory_(this) {
   // Pre-fill |notification_info_map_|.
   for (int i = FIRST_REAL_MODEL_TYPE; i < MODEL_TYPE_COUNT; ++i) {
     notification_info_map_.insert(
         std::make_pair(ModelTypeFromInt(i), NotificationInfo()));
   }
 }
 
 SyncManagerImpl::~SyncManagerImpl() {
@@ skipping 777 matching lines @@
     // This can happen in some cases.  The UI thread makes requests of us
     // when it doesn't really know which types are enabled or disabled.
     DLOG(WARNING) << "Asked to return debug info for invalid type "
                   << ModelTypeToString(type);
     return scoped_ptr<base::ListValue>();
   }
 
   return it->second->GetAllNodes();
 }
 
-void SyncManagerImpl::OnInvalidatorStateChange(InvalidatorState state) {
+void SyncManagerImpl::SetInvalidatorEnabled(bool invalidator_enabled) {
   DCHECK(thread_checker_.CalledOnValidThread());
 
-  const std::string& state_str = InvalidatorStateToString(state);
-  invalidator_state_ = state;
-  DVLOG(1) << "Invalidator state changed to: " << state_str;
-  const bool notifications_enabled =
-      (invalidator_state_ == INVALIDATIONS_ENABLED);
-  allstatus_.SetNotificationsEnabled(notifications_enabled);
-  scheduler_->SetNotificationsEnabled(notifications_enabled);
+  DVLOG(1) << "Invalidator enabled state is now: " << invalidator_enabled;
+  allstatus_.SetNotificationsEnabled(invalidator_enabled);
+  scheduler_->SetNotificationsEnabled(invalidator_enabled);
 }
 
 void SyncManagerImpl::OnIncomingInvalidation(
     syncer::ModelType type,
     scoped_ptr<InvalidationInterface> invalidation) {
   DCHECK(thread_checker_.CalledOnValidThread());
 
   scheduler_->ScheduleInvalidationNudge(
       TimeDelta::FromMilliseconds(kSyncSchedulerDelayMsec),
       type,
@@ skipping 145 matching lines @@
 int SyncManagerImpl::GetDefaultNudgeDelay() {
   return kDefaultNudgeDelayMilliseconds;
 }
 
 // static.
 int SyncManagerImpl::GetPreferencesNudgeDelay() {
   return kPreferencesNudgeDelayMilliseconds;
 }
 
 }  // namespace syncer