Merge 208347 "Revert 208315 "Make use of InvalidationService""

sync/internal_api/public/test/fake_sync_manager.h

Index: sync/internal_api/public/test/fake_sync_manager.h
===================================================================
--- sync/internal_api/public/test/fake_sync_manager.h	(revision 208727)
+++ sync/internal_api/public/test/fake_sync_manager.h	(working copy)
@@ -62,11 +62,10 @@
   ConfigureReason GetAndResetConfigureReason();
 
   // Posts a method to invalidate the given IDs on the sync thread.
-  virtual void OnIncomingInvalidation(
-      const ObjectIdInvalidationMap& invalidation_map) OVERRIDE;
+  void Invalidate(const ObjectIdInvalidationMap& invalidation_map);
 
   // Posts a method to update the invalidator state on the sync thread.
-  virtual void OnInvalidatorStateChange(InvalidatorState state) OVERRIDE;
+  void UpdateInvalidatorState(InvalidatorState state);
 
   // Block until the sync thread has finished processing any pending messages.
   void WaitForSyncThread();
@@ -85,6 +84,7 @@
       ExtensionsActivityMonitor* extensions_activity_monitor,
       ChangeDelegate* change_delegate,
       const SyncCredentials& credentials,
+      scoped_ptr<Invalidator> invalidator,
       const std::string& invalidator_client_id,
       const std::string& restored_key_for_bootstrapping,
       const std::string& restored_keystore_key_for_bootstrapping,
@@ -100,6 +100,17 @@
       ModelTypeSet types) OVERRIDE;
   virtual bool PurgePartiallySyncedTypes() OVERRIDE;
   virtual void UpdateCredentials(const SyncCredentials& credentials) OVERRIDE;
+  virtual void UpdateEnabledTypes(ModelTypeSet types) OVERRIDE;
+  virtual void RegisterInvalidationHandler(
+      InvalidationHandler* handler) OVERRIDE;
+  virtual void UpdateRegisteredInvalidationIds(
+      InvalidationHandler* handler,
+      const ObjectIdSet& ids) OVERRIDE;
+  virtual void UnregisterInvalidationHandler(
+      InvalidationHandler* handler) OVERRIDE;
+  virtual void AcknowledgeInvalidation(
+      const invalidation::ObjectId& id,
+      const syncer::AckHandle& ack_handle) OVERRIDE;
   virtual void StartSyncingNormally(
       const ModelSafeRoutingInfo& routing_info) OVERRIDE;
   virtual void ConfigureSyncer(
@@ -125,6 +136,10 @@
   virtual void RefreshTypes(ModelTypeSet types) OVERRIDE;
 
  private:
+  void InvalidateOnSyncThread(
+      const ObjectIdInvalidationMap& invalidation_map);
+  void UpdateInvalidatorStateOnSyncThread(InvalidatorState state);
+
   scoped_refptr<base::SequencedTaskRunner> sync_task_runner_;
 
   ObserverList<SyncManager::Observer> observers_;