Convert UserPolicySigninService to use OAuth2TokenService

chrome/browser/signin/token_service_unittest.cc

Index: chrome/browser/signin/token_service_unittest.cc
diff --git a/chrome/browser/signin/token_service_unittest.cc b/chrome/browser/signin/token_service_unittest.cc
index 0617ae5764cc572f46ff2e87540af60a227a387b..565d30a4832be998a8e12bb91d43bd5b2e9955de 100644
--- a/chrome/browser/signin/token_service_unittest.cc
+++ b/chrome/browser/signin/token_service_unittest.cc
@@ -64,7 +64,8 @@ void TokenServiceTestHarness::SetUp() {
   oauth_token_ = "oauth";
   oauth_secret_ = "secret";
 
-  profile_.reset(new TestingProfile());
+  profile_ = CreateProfile().Pass();
+
   profile_->CreateWebDataService();
 
   // Force the loading of the WebDataService.
@@ -81,6 +82,10 @@ void TokenServiceTestHarness::SetUp() {
   service()->Initialize("test", profile_.get());
 }
 
+scoped_ptr<TestingProfile> TokenServiceTestHarness::CreateProfile() {
+  return scoped_ptr<TestingProfile>(new TestingProfile());

[awong, 2013/08/16 17:53:16]

not sure it's cleaner, but fyi people sometimes like

return make_scoped_ptr(new TetingProfile());

[Andrew T Wilson (Slow), 2013/08/19 12:15:56]

It's smaller, which is good enough for me :) Done.

+}
+
 void TokenServiceTestHarness::TearDown() {
   // You have to destroy the profile before the threads are shut down.
   profile_.reset();