Convert UserPolicySigninService to use OAuth2TokenService

chrome/browser/signin/profile_oauth2_token_service_request_unittest.cc

Index: chrome/browser/signin/profile_oauth2_token_service_request_unittest.cc
diff --git a/chrome/browser/signin/profile_oauth2_token_service_request_unittest.cc b/chrome/browser/signin/profile_oauth2_token_service_request_unittest.cc
index ef1c18b421d6203dd37640206be6937bd4e35992..6fb6e5b442972b19286842f44ec94ddacab351ed 100644
--- a/chrome/browser/signin/profile_oauth2_token_service_request_unittest.cc
+++ b/chrome/browser/signin/profile_oauth2_token_service_request_unittest.cc
@@ -181,9 +181,11 @@ class ProfileOAuth2TokenServiceRequestTest : public testing::Test {
 void ProfileOAuth2TokenServiceRequestTest::SetUp() {
   ui_thread_.reset(new content::TestBrowserThread(content::BrowserThread::UI,
                                                   &ui_loop_));
-  profile_.reset(new TestingProfile());
-  ProfileOAuth2TokenServiceFactory::GetInstance()->SetTestingFactory(
-      profile_.get(), &CreateOAuth2TokenService);
+  TestingProfile::Builder builder;
+  builder.AddTestingFactory(ProfileOAuth2TokenServiceFactory::GetInstance(),
+                            &CreateOAuth2TokenService);
+  profile_ = builder.Build();
+
   oauth2_service_ = (MockProfileOAuth2TokenService*)
       ProfileOAuth2TokenServiceFactory::GetForProfile(profile_.get());
 }