Convert UserPolicySigninService to use OAuth2TokenService

chrome/browser/signin/profile_oauth2_token_service_request_unittest.cc

 // Copyright 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 "chrome/browser/signin/profile_oauth2_token_service_request.h"
 
 #include <set>
 #include <string>
 #include <vector>
 #include "base/threading/thread.h"
 #include "chrome/browser/signin/oauth2_token_service.h"
@@ skipping 163 matching lines @@
   scoped_ptr<Profile> profile_;
   TestingOAuth2TokenServiceConsumer consumer_;
   MockProfileOAuth2TokenService* oauth2_service_;
 
   scoped_ptr<ProfileOAuth2TokenServiceRequest> request_;
 };
 
 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());
 }
 
 TEST_F(ProfileOAuth2TokenServiceRequestTest,
        Failure) {
   oauth2_service_->SetExpectation(false, std::string());
   scoped_ptr<ProfileOAuth2TokenServiceRequest> request(
       ProfileOAuth2TokenServiceRequest::CreateAndStart(
           profile_.get(),
@@ skipping 37 matching lines @@
           profile_.get(),
           std::set<std::string>(),
           &consumer_));
   ui_loop_.RunUntilIdle();
   request.reset();
   EXPECT_EQ(1, consumer_.number_of_successful_tokens_);
   EXPECT_EQ(0, consumer_.number_of_errors_);
 }
 
 }  // namespace