Convert UserPolicySigninService to use OAuth2TokenService

chrome/browser/sync/profile_sync_service_session_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 <map>
 #include <string>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/callback.h"
@@ skipping 194 matching lines @@
     tab->set_extension_app_id("app_id");
     sync_pb::TabNavigation* navigation = tab->add_navigation();
     navigation->set_virtual_url("http://foo/1");
     navigation->set_referrer("referrer");
     navigation->set_title("title");
     navigation->set_page_transition(sync_pb::SyncEnums_PageTransition_TYPED);
   }
 
  protected:
   virtual TestingProfile* CreateProfile() OVERRIDE {
-    TestingProfile* profile = new TestingProfile();
+    TestingProfile::Builder builder;
+    builder.AddTestingFactory(ProfileOAuth2TokenServiceFactory::GetInstance(),
+                              FakeOAuth2TokenService::BuildTokenService);
     // Don't want the profile to create a real ProfileSyncService.
-    ProfileSyncServiceFactory::GetInstance()->SetTestingFactory(profile,
-                                                                NULL);
+    builder.AddTestingFactory(ProfileSyncServiceFactory::GetInstance(), NULL);
+    scoped_ptr<TestingProfile> profile(builder.Build().Pass());

[awong, 2013/08/19 19:47:21]

.Pass() on return values are always superfluous.

[Andrew T Wilson (Slow), 2013/08/20 09:28:35]

Thanks! I appreciate the drive-by - I learned things! Like not to sprinkle
Pass() around my code as if it were salt.

     invalidation::InvalidationServiceFactory::GetInstance()->
         SetBuildOnlyFakeInvalidatorsForTest(true);
-    return profile;
+    return profile.release();
   }
 
   virtual void SetUp() {
     // BrowserWithTestWindowTest implementation.
     BrowserWithTestWindowTest::SetUp();
     ASSERT_TRUE(temp_dir_.CreateUniqueTempDir());
     registrar_.Add(this, chrome::NOTIFICATION_FOREIGN_SESSION_UPDATED,
         content::NotificationService::AllSources());
     registrar_.Add(this, chrome::NOTIFICATION_SYNC_REFRESH_LOCAL,
         content::NotificationService::AllSources());
@@ skipping 32 matching lines @@
     BrowserWithTestWindowTest::TearDown();
   }
 
   bool StartSyncService(const base::Closure& callback,
                         bool will_fail_association) {
     if (sync_service_)
       return false;
     SigninManagerBase* signin =
         SigninManagerFactory::GetForProfile(profile());
     signin->SetAuthenticatedUsername("test_user");
-    ProfileOAuth2TokenServiceFactory::GetInstance()->SetTestingFactory(
-        profile(), FakeOAuth2TokenService::BuildTokenService);
     ProfileSyncComponentsFactoryMock* factory =
         new ProfileSyncComponentsFactoryMock();
     sync_service_.reset(new FakeProfileSyncService(
         factory,
         profile(),
         signin,
         ProfileSyncService::AUTO_START,
         false));
     sync_service_->set_backend_init_callback(callback);
 
@@ skipping 1109 matching lines @@
     tab_node.SetSessionSpecifics(specifics);
   }
 
   error = model_associator_->DisassociateModels();
   ASSERT_FALSE(error.IsSet());
   error = model_associator_->AssociateModels(NULL, NULL);
   ASSERT_FALSE(error.IsSet());
 }
 
 }  // namespace browser_sync