Convert UserPolicySigninService to use OAuth2TokenService

chrome/browser/signin/ubertoken_fetcher_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 "chrome/browser/signin/ubertoken_fetcher.h"
 
 #include "base/memory/scoped_ptr.h"
 #include "chrome/browser/signin/profile_oauth2_token_service.h"
 #include "chrome/browser/signin/profile_oauth2_token_service_factory.h"
 #include "chrome/browser/signin/token_service_unittest.h"
@@ skipping 46 matching lines @@
   token_service->Initialize(static_cast<Profile*>(profile));
   return token_service;
 }
 
 }  // namespace
 
 class UbertokenFetcherTest : public TokenServiceTestHarness {
  public:
   virtual void SetUp() OVERRIDE {
     TokenServiceTestHarness::SetUp();
-
-    ProfileOAuth2TokenServiceFactory::GetInstance()->
-        SetTestingFactoryAndUse(profile(), Build);
     UpdateCredentialsOnService();
     fetcher_.reset(new UbertokenFetcher(profile(), &consumer_));
   }
 
+  virtual scoped_ptr<TestingProfile> CreateProfile() OVERRIDE {
+    TestingProfile::Builder builder;
+    builder.AddTestingFactory(ProfileOAuth2TokenServiceFactory::GetInstance(),
+                              Build);
+    return builder.Build().Pass();
+  }
+
   virtual void TearDown() OVERRIDE {
     fetcher_.reset();
     TokenServiceTestHarness::TearDown();
   }
 
  protected:
   net::TestURLFetcherFactory factory_;
   MockUbertokenConsumer consumer_;
   scoped_ptr<UbertokenFetcher> fetcher_;
 };
@@ skipping 39 matching lines @@
   service()->IssueAuthTokenForTest(GaiaConstants::kGaiaOAuth2LoginRefreshToken,
                                    "refreshToken");
   fetcher_->StartFetchingToken();
   fetcher_->OnGetTokenSuccess(NULL, "accessToken", base::Time());
   fetcher_->OnUberAuthTokenFailure(error);
 
   EXPECT_EQ(1, consumer_.nb_error_);
   EXPECT_EQ(0, consumer_.nb_correct_token_);
   EXPECT_EQ("", consumer_.last_token_);
 }