Clean up InvalidationService test infrastructure.

chrome/browser/invalidation/invalidation_service_factory.h

Index: chrome/browser/invalidation/invalidation_service_factory.h
diff --git a/chrome/browser/invalidation/invalidation_service_factory.h b/chrome/browser/invalidation/invalidation_service_factory.h
index caf8656139eae36828aa9b57b1c4318963f9116c..5bcfa60ccaf885e3404cce35102ce05b3dde5a0f 100644
--- a/chrome/browser/invalidation/invalidation_service_factory.h
+++ b/chrome/browser/invalidation/invalidation_service_factory.h
@@ -21,9 +21,9 @@ class Profile;
 
 namespace invalidation {
 
+class FakeInvalidationService;
 class InvalidationService;
 class P2PInvalidationService;
-class FakeInvalidationService;
 
 // A BrowserContextKeyedServiceFactory to construct InvalidationServices.  The
 // implementation of the InvalidationService may be completely different on
@@ -36,14 +36,9 @@ class InvalidationServiceFactory : public BrowserContextKeyedServiceFactory {
 
   static InvalidationServiceFactory* GetInstance();
 
-  // A helper function to set this factory to return FakeInvalidationServices
-  // instead of the default InvalidationService objects.
-  void SetBuildOnlyFakeInvalidatorsForTest(bool test_mode_enabled);
-
-  // These helper functions to set the factory to build a test-only type of
-  // invalidator and return the instance immeidately.
-  P2PInvalidationService* BuildAndUseP2PInvalidationServiceForTest(
-      content::BrowserContext* context);
+  // Switches service creation to go through |testing_factory| for all browser
+  // contexts.
+  void RegisterTestingFactory(TestingFactoryFunction testing_factory);
 
  private:
   friend struct DefaultSingletonTraits<InvalidationServiceFactory>;
@@ -57,8 +52,7 @@ class InvalidationServiceFactory : public BrowserContextKeyedServiceFactory {
   virtual void RegisterProfilePrefs(
       user_prefs::PrefRegistrySyncable* registry) OVERRIDE;
 
-  // If true, this factory will return only FakeInvalidationService instances.
-  bool build_fake_invalidators_;
+  TestingFactoryFunction testing_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(InvalidationServiceFactory);
 };