[Invalidations] Add GetInvalidatorState() to Invalidator{,Frontend}

chrome/browser/sync/glue/chrome_sync_notification_bridge.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 "chrome/browser/sync/glue/chrome_sync_notification_bridge.h"
 
 #include "base/bind.h"
 #include "base/location.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 18 matching lines @@
   // All member functions below must be called on the sync task runner.
 
   void InitializeOnSyncThread();
   void CleanupOnSyncThread();
 
   void RegisterHandler(syncer::InvalidationHandler* handler);
   void UpdateRegisteredIds(syncer::InvalidationHandler* handler,
                            const syncer::ObjectIdSet& ids);
   void UnregisterHandler(syncer::InvalidationHandler* handler);
 
-  void EmitNotification(
+  void EmitInvalidation(
       const syncer::ObjectIdStateMap& state_map,
-      syncer::IncomingNotificationSource notification_source);
+      syncer::IncomingInvalidationSource invalidation_source);
 
   bool IsHandlerRegisteredForTest(syncer::InvalidationHandler* handler) const;
   syncer::ObjectIdSet GetRegisteredIdsForTest(
       syncer::InvalidationHandler* handler) const;
 
  private:
   friend class base::RefCountedThreadSafe<Core>;
 
   // Destroyed on the UI thread or on |sync_task_runner_|.
   ~Core();
@@ skipping 37 matching lines @@
   DCHECK(sync_task_runner_->RunsTasksOnCurrentThread());
   invalidator_registrar_->UpdateRegisteredIds(handler, ids);
 }
 
 void ChromeSyncNotificationBridge::Core::UnregisterHandler(
     syncer::InvalidationHandler* handler) {
   DCHECK(sync_task_runner_->RunsTasksOnCurrentThread());
   invalidator_registrar_->UnregisterHandler(handler);
 }
 
-void ChromeSyncNotificationBridge::Core::EmitNotification(
+void ChromeSyncNotificationBridge::Core::EmitInvalidation(
     const syncer::ObjectIdStateMap& state_map,
-    syncer::IncomingNotificationSource notification_source) {
+    syncer::IncomingInvalidationSource invalidation_source) {
   DCHECK(sync_task_runner_->RunsTasksOnCurrentThread());
   const syncer::ObjectIdStateMap& effective_state_map =
       state_map.empty() ?
       ObjectIdSetToStateMap(
           invalidator_registrar_->GetAllRegisteredIds(), std::string()) :
       state_map;
 
   invalidator_registrar_->DispatchInvalidationsToHandlers(
-      effective_state_map, notification_source);
+      effective_state_map, invalidation_source);
 }
 
 bool ChromeSyncNotificationBridge::Core::IsHandlerRegisteredForTest(
     syncer::InvalidationHandler* handler) const {
   DCHECK(sync_task_runner_->RunsTasksOnCurrentThread());
   return invalidator_registrar_->IsHandlerRegisteredForTest(handler);
 }
 
 syncer::ObjectIdSet
 ChromeSyncNotificationBridge::Core::GetRegisteredIdsForTest(
@@ skipping 59 matching lines @@
   DCHECK(sync_task_runner_->RunsTasksOnCurrentThread());
   return core_->GetRegisteredIdsForTest(handler);
 }
 
 void ChromeSyncNotificationBridge::Observe(
     int type,
     const content::NotificationSource& source,
     const content::NotificationDetails& details) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
-  syncer::IncomingNotificationSource notification_source;
+  syncer::IncomingInvalidationSource invalidation_source;
   if (type == chrome::NOTIFICATION_SYNC_REFRESH_LOCAL) {
-    notification_source = syncer::LOCAL_NOTIFICATION;
+    invalidation_source = syncer::LOCAL_INVALIDATION;
   } else if (type == chrome::NOTIFICATION_SYNC_REFRESH_REMOTE) {
-    notification_source = syncer::REMOTE_NOTIFICATION;
+    invalidation_source = syncer::REMOTE_INVALIDATION;
   } else {
-    NOTREACHED() << "Unexpected notification type: " << type;
+    NOTREACHED() << "Unexpected invalidation type: " << type;
     return;
   }
 
   // TODO(akalin): Use ObjectIdStateMap here instead.  We'll have to
   // make sure all emitters of the relevant notifications also use
   // ObjectIdStateMap.
   content::Details<const syncer::ModelTypeStateMap>
       state_details(details);
   const syncer::ModelTypeStateMap& state_map = *(state_details.ptr());
   if (!sync_task_runner_->PostTask(
           FROM_HERE,
-          base::Bind(&Core::EmitNotification,
+          base::Bind(&Core::EmitInvalidation,
                      core_,
                      ModelTypeStateMapToObjectIdStateMap(state_map),
-                     notification_source))) {
+                     invalidation_source))) {
     NOTREACHED();
   }
 }
 
 }  // namespace browser_sync