Convert UserPolicySigninService to use OAuth2TokenService

chrome/browser/signin/token_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.
 //
 // This file defines a unit test for the profile's token service.
 
 #include "chrome/browser/signin/token_service_unittest.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
@@ skipping 46 matching lines @@
 #if defined(OS_MACOSX)
   Encryptor::UseMockKeychain(true);
 #endif
   credentials_.sid = "sid";
   credentials_.lsid = "lsid";
   credentials_.token = "token";
   credentials_.data = "data";
   oauth_token_ = "oauth";
   oauth_secret_ = "secret";
 
-  profile_.reset(new TestingProfile());
+  profile_ = CreateProfile().Pass();
+
   profile_->CreateWebDataService();
 
   // Force the loading of the WebDataService.
   TokenWebData::FromBrowserContext(profile_.get());
   base::RunLoop().RunUntilIdle();
 
   service_ = TokenServiceFactory::GetForProfile(profile_.get());
 
   success_tracker_.ListenFor(chrome::NOTIFICATION_TOKEN_AVAILABLE,
                              content::Source<TokenService>(service_));
   failure_tracker_.ListenFor(chrome::NOTIFICATION_TOKEN_REQUEST_FAILED,
                              content::Source<TokenService>(service_));
 
   service()->Initialize("test", profile_.get());
 }
 
+scoped_ptr<TestingProfile> TokenServiceTestHarness::CreateProfile() {
+  return make_scoped_ptr(new TestingProfile());
+}
+
 void TokenServiceTestHarness::TearDown() {
   // You have to destroy the profile before the threads are shut down.
   profile_.reset();
 }
 
 void TokenServiceTestHarness::UpdateCredentialsOnService() {
   service()->UpdateCredentials(credentials_);
 }
 
 class TokenServiceTest : public TokenServiceTestHarness {
@@ skipping 301 matching lines @@
 
     *CommandLine::ForCurrentProcess() = original_cl;
   }
 };
 
 TEST_F(TokenServiceCommandLineTest, TestValueOverride) {
   EXPECT_TRUE(service()->HasTokenForService("my_service"));
   EXPECT_EQ("my_value", service()->GetTokenForService("my_service"));
 }
 #endif   // ifndef NDEBUG