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

chrome/browser/sync/test_profile_sync_service.h

Index: chrome/browser/sync/test_profile_sync_service.h
===================================================================
--- chrome/browser/sync/test_profile_sync_service.h	(revision 208727)
+++ chrome/browser/sync/test_profile_sync_service.h	(working copy)
@@ -46,6 +46,8 @@
   SyncBackendHostForProfileSyncTest(
       Profile* profile,
       const base::WeakPtr<SyncPrefs>& sync_prefs,
+      const base::WeakPtr<invalidation::InvalidatorStorage>&
+          invalidator_storage,
       syncer::TestIdFactory& id_factory,
       base::Closure& callback,
       bool set_initial_sync_ended_on_init,
@@ -79,6 +81,10 @@
 
   static void SetHistoryServiceExpectations(ProfileMock* profile);
 
+  void EmitOnInvalidatorStateChange(syncer::InvalidatorState state);
+  void EmitOnIncomingInvalidation(
+      const syncer::ObjectIdInvalidationMap& invalidation_map);
+
  protected:
   virtual void InitCore(const DoInitializeOptions& options) OVERRIDE;