Rename SyncNotifier->Invalidator and SyncNotifierObserver->InvalidationHandler.

chrome/browser/sync/profile_sync_service.h

 // 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.
 
 #ifndef CHROME_BROWSER_SYNC_PROFILE_SYNC_SERVICE_H_
 #define CHROME_BROWSER_SYNC_PROFILE_SYNC_SERVICE_H_
 
 #include <list>
 #include <string>
 
@@ skipping 22 matching lines @@
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
 #include "content/public/browser/notification_types.h"
 #include "googleurl/src/gurl.h"
 #include "sync/internal_api/public/base/model_type.h"
 #include "sync/internal_api/public/engine/model_safe_worker.h"
 #include "sync/internal_api/public/sync_manager_factory.h"
 #include "sync/internal_api/public/util/experiments.h"
 #include "sync/internal_api/public/util/unrecoverable_error_handler.h"
 #include "sync/js/sync_js_controller.h"
-#include "sync/notifier/sync_notifier_registrar.h"
+#include "sync/notifier/invalidator_registrar.h"
 
 class Profile;
 class ProfileSyncComponentsFactory;
 class SigninManager;
 class SyncGlobalError;
 
 namespace browser_sync {
 class BackendMigrator;
 class ChangeProcessor;
 class DataTypeManager;
@@ skipping 197 matching lines @@
   void GetDataTypeControllerStates(
     browser_sync::DataTypeController::StateMap* state_map) const;
 
   // Disables sync for user. Use ShowLoginDialog to enable.
   virtual void DisableForUser();
 
   // Whether sync is enabled by user or not.
   virtual bool HasSyncSetupCompleted() const;
   virtual void SetSyncSetupCompleted();
 
-  // syncer::SyncNotifier implementation (via SyncFrontend).
+  // syncer::InvalidationHandler implementation (via SyncFrontend).
   virtual void OnNotificationsEnabled() OVERRIDE;
   virtual void OnNotificationsDisabled(
       syncer::NotificationsDisabledReason reason) OVERRIDE;
   virtual void OnIncomingNotification(
       const syncer::ObjectIdStateMap& id_state_map,
       syncer::IncomingNotificationSource source) OVERRIDE;
 
   // SyncFrontend implementation.
   virtual void OnBackendInitialized(
       const syncer::WeakHandle<syncer::JsBackend>& js_backend,
@@ skipping 318 matching lines @@
 
   // NOTE(akalin): Invalidations that come in during browser shutdown may get
   // dropped.  This won't matter once we have an Acknowledge API, though: see
   // http://crbug.com/78462 and http://crbug.com/124149.
 
   // Starts sending notifications to |handler|.  |handler| must not be NULL,
   // and it must already be registered.
   //
   // Handler registrations are persisted across restarts of sync.
   virtual void RegisterInvalidationHandler(
-      syncer::SyncNotifierObserver* handler) OVERRIDE;
+      syncer::InvalidationHandler* handler) OVERRIDE;
 
   // Updates the set of ObjectIds associated with |handler|.  |handler| must
   // not be NULL, and must already be registered.  An ID must be registered for
   // at most one handler.
   //
   // Registered IDs are persisted across restarts of sync.
   virtual void UpdateRegisteredInvalidationIds(
-      syncer::SyncNotifierObserver* handler,
+      syncer::InvalidationHandler* handler,
       const syncer::ObjectIdSet& ids) OVERRIDE;
 
   // Stops sending notifications to |handler|.  |handler| must not be NULL, and
   // it must already be registered.  Note that this doesn't unregister the IDs
   // associated with |handler|.
   //
   // Handler registrations are persisted across restarts of sync.
   virtual void UnregisterInvalidationHandler(
-      syncer::SyncNotifierObserver* handler) OVERRIDE;
+      syncer::InvalidationHandler* handler) OVERRIDE;
 
   // ProfileKeyedService implementation.
   virtual void Shutdown() OVERRIDE;
 
  protected:
   // Used by test classes that derive from ProfileSyncService.
   virtual browser_sync::SyncBackendHost* GetBackendForTest();
 
   // Helper to install and configure a data type manager.
   void ConfigureDataTypeManager();
@@ skipping 256 matching lines @@
   // data types.
   bool setup_in_progress_;
 
   // The set of currently enabled sync experiments.
   syncer::Experiments current_experiments;
 
   // Factory the backend will use to build the SyncManager.
   syncer::SyncManagerFactory sync_manager_factory_;
 
   // Dispatches invalidations to handlers.
-  syncer::SyncNotifierRegistrar notifier_registrar_;
+  syncer::InvalidatorRegistrar invalidator_registrar_;
 
   DISALLOW_COPY_AND_ASSIGN(ProfileSyncService);
 };
 
 bool ShouldShowActionOnUI(
     const syncer::SyncProtocolError& error);
 
 
 #endif  // CHROME_BROWSER_SYNC_PROFILE_SYNC_SERVICE_H_