Convert UserPolicySigninService to use OAuth2TokenService

chrome/test/base/testing_profile_manager.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/test/base/testing_profile_manager.h"
 
 #include "base/memory/ref_counted.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/extensions/extension_special_storage_policy.h"
 #include "chrome/browser/prefs/pref_service_syncable.h"
 #include "chrome/browser/profiles/profile_info_cache.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/test/base/testing_browser_process.h"
 #include "chrome/test/base/testing_profile.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace testing {
 
-class ProfileManager : public ::ProfileManager {
+class ProfileManager : public ::ProfileManagerWithoutInit {
  public:
   explicit ProfileManager(const base::FilePath& user_data_dir)
-      : ::ProfileManager(user_data_dir) {}
+      : ::ProfileManagerWithoutInit(user_data_dir) {}
 
  protected:
   virtual Profile* CreateProfileHelper(
       const base::FilePath& file_path) OVERRIDE {
     return new TestingProfile(file_path);
   }
 };
 
 }  // namespace testing
 
@@ skipping 17 matching lines @@
     const string16& user_name,
     int avatar_id,
     const std::string& managed_user_id) {
   DCHECK(called_set_up_);
 
   // Create a path for the profile based on the name.
   base::FilePath profile_path(profiles_dir_.path());
   profile_path = profile_path.AppendASCII(profile_name);
 
   // Create the profile and register it.
-  TestingProfile* profile = new TestingProfile(
-      profile_path,
-      NULL,
-      scoped_refptr<ExtensionSpecialStoragePolicy>(),
-      prefs.Pass());
+  TestingProfile::Builder builder;
+  builder.SetPath(profile_path);
+  builder.SetPrefService(prefs.Pass());
+  TestingProfile* profile = builder.Build().release();
   profile_manager_->AddProfile(profile);  // Takes ownership.
 
   // Update the user metadata.
   ProfileInfoCache& cache = profile_manager_->GetProfileInfoCache();
   size_t index = cache.GetIndexOfProfileWithPath(profile_path);
   cache.SetAvatarIconOfProfileAtIndex(index, avatar_id);
   cache.SetManagedUserIdOfProfileAtIndex(index, managed_user_id);
   // SetNameOfProfileAtIndex may reshuffle the list of profiles, so we do it
   // last.
   cache.SetNameOfProfileAtIndex(index, user_name);
@@ skipping 52 matching lines @@
       << "ProfileManager already exists";
 
   // Set up the directory for profiles.
   ASSERT_TRUE(profiles_dir_.CreateUniqueTempDir());
 
   profile_manager_ = new testing::ProfileManager(profiles_dir_.path());
   browser_process_->SetProfileManager(profile_manager_);  // Takes ownership.
 
   called_set_up_ = true;
 }