Convert UserPolicySigninService to use OAuth2TokenService

chrome/browser/sync/profile_sync_service_unittest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/file_util.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/run_loop.h"
 #include "base/values.h"
@@ skipping 41 matching lines @@
 
 class ProfileSyncServiceTestHarness {
  public:
   ProfileSyncServiceTestHarness()
       : thread_bundle_(content::TestBrowserThreadBundle::REAL_DB_THREAD |
                        content::TestBrowserThreadBundle::REAL_FILE_THREAD |
                        content::TestBrowserThreadBundle::REAL_IO_THREAD) {
    }
 
   void SetUp() {
-    profile.reset(new TestingProfile());
+    TestingProfile::Builder builder;
+    builder.AddTestingFactory(ProfileOAuth2TokenServiceFactory::GetInstance(),
+                              FakeOAuth2TokenService::BuildTokenService);
+    profile = builder.Build().Pass();
     invalidation::InvalidationServiceFactory::GetInstance()->
         SetBuildOnlyFakeInvalidatorsForTest(true);
-    ProfileOAuth2TokenServiceFactory::GetInstance()->SetTestingFactory(
-        profile.get(), FakeOAuth2TokenService::BuildTokenService);
   }
 
   void TearDown() {
     // Kill the service before the profile.
     if (service) {
       service->Shutdown();
     }
     service.reset();
     profile.reset();
     // Pump messages posted by the sync thread (which may end up
@@ skipping 400 matching lines @@
 TEST_F(ProfileSyncServiceTest, FailToDownloadControlTypes) {
   harness_.StartSyncServiceAndSetInitialSyncEnded(false, true, true, true,
                                                   syncer::STORAGE_IN_MEMORY);
 
   // The backend is not ready.  Ensure the PSS knows this.
   EXPECT_FALSE(harness_.service->sync_initialized());
 }
 
 }  // namespace
 }  // namespace browser_sync