Refactor ModelTypePayloadMap and ObjectIdPayloadMap to StateMaps.

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 19 matching lines @@
   void InitializeOnSyncThread();
   void CleanupOnSyncThread();
 
   void UpdateEnabledTypes(syncer::ModelTypeSet enabled_types);
   void RegisterHandler(syncer::SyncNotifierObserver* handler);
   void UpdateRegisteredIds(syncer::SyncNotifierObserver* handler,
                            const syncer::ObjectIdSet& ids);
   void UnregisterHandler(syncer::SyncNotifierObserver* handler);
 
   void EmitNotification(
-      const syncer::ModelTypePayloadMap& payload_map,
+      const syncer::ModelTypeStateMap& state_map,
       syncer::IncomingNotificationSource notification_source);
 
  private:
   friend class base::RefCountedThreadSafe<Core>;
 
   // Destroyed on the UI thread or on |sync_task_runner_|.
   ~Core();
 
   const scoped_refptr<base::SequencedTaskRunner> sync_task_runner_;
 
@@ skipping 42 matching lines @@
   notifier_registrar_->UpdateRegisteredIds(handler, ids);
 }
 
 void ChromeSyncNotificationBridge::Core::UnregisterHandler(
     syncer::SyncNotifierObserver* handler) {
   DCHECK(sync_task_runner_->RunsTasksOnCurrentThread());
   notifier_registrar_->UnregisterHandler(handler);
 }
 
 void ChromeSyncNotificationBridge::Core::EmitNotification(
-    const syncer::ModelTypePayloadMap& payload_map,
+    const syncer::ModelTypeStateMap& state_map,
     syncer::IncomingNotificationSource notification_source) {
   DCHECK(sync_task_runner_->RunsTasksOnCurrentThread());
-  const syncer::ModelTypePayloadMap& effective_payload_map =
-      payload_map.empty() ?
-      syncer::ModelTypePayloadMapFromEnumSet(enabled_types_, std::string()) :
-      payload_map;
+  const syncer::ModelTypeStateMap& effective_state_map =
+      state_map.empty() ?
+      syncer::ModelTypeSetToStateMap(enabled_types_, std::string()) :
+      state_map;
 
   notifier_registrar_->DispatchInvalidationsToHandlers(
-      ModelTypePayloadMapToObjectIdPayloadMap(effective_payload_map),
+      ModelTypeStateMapToObjectIdStateMap(effective_state_map),
       notification_source);
 }
 
 ChromeSyncNotificationBridge::ChromeSyncNotificationBridge(
     const Profile* profile,
     const scoped_refptr<base::SequencedTaskRunner>& sync_task_runner)
     : sync_task_runner_(sync_task_runner),
       core_(new Core(sync_task_runner_)) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   DCHECK(profile);
@@ skipping 51 matching lines @@
   syncer::IncomingNotificationSource notification_source;
   if (type == chrome::NOTIFICATION_SYNC_REFRESH_LOCAL) {
     notification_source = syncer::LOCAL_NOTIFICATION;
   } else if (type == chrome::NOTIFICATION_SYNC_REFRESH_REMOTE) {
     notification_source = syncer::REMOTE_NOTIFICATION;
   } else {
     NOTREACHED() << "Unexpected notification type: " << type;
     return;
   }
 
-  content::Details<const syncer::ModelTypePayloadMap>
-      payload_details(details);
-  const syncer::ModelTypePayloadMap& payload_map = *(payload_details.ptr());
+  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,
-                     core_, payload_map, notification_source))) {
+                     core_, state_map, notification_source))) {
     NOTREACHED();
   }
 }
 
 }  // namespace browser_sync