Clean up InvalidationService test infrastructure.

chrome/browser/extensions/api/push_messaging/push_messaging_apitest.cc

Index: chrome/browser/extensions/api/push_messaging/push_messaging_apitest.cc
diff --git a/chrome/browser/extensions/api/push_messaging/push_messaging_apitest.cc b/chrome/browser/extensions/api/push_messaging/push_messaging_apitest.cc
index 01cc1a4a637e3caa42c89614a2befdf54ea2579f..9e80fd8e47114e95e8dd88d210754d5cee59675b 100644
--- a/chrome/browser/extensions/api/push_messaging/push_messaging_apitest.cc
+++ b/chrome/browser/extensions/api/push_messaging/push_messaging_apitest.cc
@@ -22,9 +22,9 @@
 #include "sync/notifier/fake_invalidator.h"
 #include "testing/gmock/include/gmock/gmock.h"
 
-using ::testing::_;
 using ::testing::SaveArg;
 using ::testing::StrictMock;
+using ::testing::_;
 
 using invalidation::InvalidationServiceFactory;
 
@@ -66,8 +66,8 @@ class PushMessagingApiTest : public ExtensionApiTest {
   }
 
   virtual void SetUp() OVERRIDE {
-    InvalidationServiceFactory::GetInstance()->
-        SetBuildOnlyFakeInvalidatorsForTest(true);
+    InvalidationServiceFactory::GetInstance()->RegisterTestingFactory(
+        invalidation::FakeInvalidationService::Build);
     ExtensionApiTest::SetUp();
   }