Refactor ModelTypePayloadMap and ObjectIdPayloadMap to StateMaps.

sync/internal_api/public/test/fake_sync_manager.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 SYNC_INTERNAL_API_PUBLIC_TEST_FAKE_SYNC_MANAGER_H_
 #define SYNC_INTERNAL_API_PUBLIC_TEST_FAKE_SYNC_MANAGER_H_
 
 #include <string>
 
 #include "base/memory/ref_counted.h"
@@ skipping 36 matching lines @@
   // Returns those types that have been downloaded since the last call to
   // GetAndResetDownloadedTypes(), or since startup if never called.
   ModelTypeSet GetAndResetDownloadedTypes();
 
   // Returns those types that have been marked as enabled since the
   // last call to GetAndResetEnabledTypes(), or since startup if never
   // called.
   ModelTypeSet GetAndResetEnabledTypes();
 
   // Posts a method to invalidate the given IDs on the sync thread.
-  void Invalidate(const ObjectIdPayloadMap& id_payloads,
+  void Invalidate(const ObjectIdStateMap& id_state_map,
                   IncomingNotificationSource source);
 
   // Posts a method to enable notifications on the sync thread.
   void EnableNotifications();
 
   // Posts a method to disable notifications on the sync thread.
   void DisableNotifications(NotificationsDisabledReason reason);
 
   // Block until the sync thread has finished processing any pending messages.
   void WaitForSyncThread();
@@ skipping 50 matching lines @@
   virtual void SaveChanges() OVERRIDE;
   virtual void StopSyncingForShutdown(const base::Closure& callback) OVERRIDE;
   virtual void ShutdownOnSyncThread() OVERRIDE;
   virtual UserShare* GetUserShare() OVERRIDE;
   virtual bool ReceivedExperiment(Experiments* experiments) OVERRIDE;
   virtual bool HasUnsyncedItems() OVERRIDE;
   virtual SyncEncryptionHandler* GetEncryptionHandler() OVERRIDE;
 
  private:
   void InvalidateOnSyncThread(
-      const ObjectIdPayloadMap& id_payloads,
+      const ObjectIdStateMap& id_state_map,
       IncomingNotificationSource source);
   void EnableNotificationsOnSyncThread();
   void DisableNotificationsOnSyncThread(NotificationsDisabledReason reason);
 
   scoped_refptr<base::SequencedTaskRunner> sync_task_runner_;
 
   ObserverList<SyncManager::Observer> observers_;
 
   // Faked directory state.
   ModelTypeSet initial_sync_ended_types_;
@@ skipping 14 matching lines @@
   SyncNotifierRegistrar registrar_;
 
   scoped_ptr<FakeSyncEncryptionHandler> fake_encryption_handler_;
 
   DISALLOW_COPY_AND_ASSIGN(FakeSyncManager);
 };
 
 }  // namespace syncer
 
 #endif  // SYNC_INTERNAL_API_PUBLIC_TEST_FAKE_SYNC_MANAGER_H_