Clean up InvalidationService test infrastructure.

chrome/browser/sync/profile_sync_service_unittest.cc

Index: chrome/browser/sync/profile_sync_service_unittest.cc
diff --git a/chrome/browser/sync/profile_sync_service_unittest.cc b/chrome/browser/sync/profile_sync_service_unittest.cc
index 99947aaada93d2f1a098a023400073ebbaa3dbab..773fe931baef0635acc3c3c4b1e3a3c1a3c81162 100644
--- a/chrome/browser/sync/profile_sync_service_unittest.cc
+++ b/chrome/browser/sync/profile_sync_service_unittest.cc
@@ -7,6 +7,7 @@
 #include "base/memory/scoped_ptr.h"
 #include "base/run_loop.h"
 #include "base/values.h"
+#include "chrome/browser/invalidation/fake_invalidation_service.h"
 #include "chrome/browser/invalidation/invalidation_service_factory.h"
 #include "chrome/browser/managed_mode/managed_user_signin_manager_wrapper.h"
 #include "chrome/browser/signin/fake_profile_oauth2_token_service.h"
@@ -38,8 +39,8 @@ ACTION(ReturnNewDataTypeManager) {
                                                arg5);
 }
 
-using testing::_;
 using testing::StrictMock;
+using testing::_;
 
 class TestProfileSyncServiceObserver : public ProfileSyncServiceObserver {
  public:
@@ -98,7 +99,7 @@ class ProfileSyncServiceTest : public ::testing::Test {
         ProfileOAuth2TokenServiceFactory::GetInstance(),
         FakeProfileOAuth2TokenServiceWrapper::BuildAutoIssuingTokenService);
     invalidation::InvalidationServiceFactory::GetInstance()->
-        SetBuildOnlyFakeInvalidatorsForTest(true);
+        RegisterTestingFactory(invalidation::FakeInvalidationService::Build);
 
     profile_ = builder.Build().Pass();
   }