Convert UserPolicySigninService to use OAuth2TokenService

chrome/browser/signin/ubertoken_fetcher_unittest.cc

Index: chrome/browser/signin/ubertoken_fetcher_unittest.cc
diff --git a/chrome/browser/signin/ubertoken_fetcher_unittest.cc b/chrome/browser/signin/ubertoken_fetcher_unittest.cc
index 569025a13b9dac7643c7996a8d5962ead943f20e..1592d4d9dfb60eff20147657e0eccb54a81dee55 100644
--- a/chrome/browser/signin/ubertoken_fetcher_unittest.cc
+++ b/chrome/browser/signin/ubertoken_fetcher_unittest.cc
@@ -64,13 +64,17 @@ 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();