Remove most remaining sync/notifier dependencies

sync/tools/sync_client.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 <cstddef>
 #include <cstdio>
 #include <string>
 
 #include "base/at_exit.h"
 #include "base/command_line.h"
@@ skipping 203 matching lines @@
  private:
   syncer::Invalidation invalidation_;
 };
 
 class InvalidatorShim : public InvalidationHandler {
  public:
   explicit InvalidatorShim(SyncManager* sync_manager)
       : sync_manager_(sync_manager) {}
 
   virtual void OnInvalidatorStateChange(InvalidatorState state) OVERRIDE {
-    sync_manager_->OnInvalidatorStateChange(state);
+    sync_manager_->SetInvalidatorEnabled(state == INVALIDATIONS_ENABLED);
   }
 
   virtual void OnIncomingInvalidation(
       const ObjectIdInvalidationMap& invalidation_map) OVERRIDE {
     syncer::ObjectIdSet ids = invalidation_map.GetObjectIds();
     for (syncer::ObjectIdSet::const_iterator ids_it = ids.begin();
          ids_it != ids.end();
          ++ids_it) {
       syncer::ModelType type;
       if (!NotificationTypeToRealModelType(ids_it->name(), &type)) {
@@ skipping 229 matching lines @@
   io_thread.Stop();
   return 0;
 }
 
 }  // namespace
 }  // namespace syncer
 
 int main(int argc, char* argv[]) {
   return syncer::SyncClientMain(argc, argv);
 }