Convert UserPolicySigninService to use OAuth2TokenService

chrome/browser/chromeos/power/power_prefs_unittest.cc

 // Copyright 2013 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/chromeos/power/power_prefs.h"
 
 #include <string>
 
 #include "base/command_line.h"
 #include "base/files/file_path.h"
@@ skipping 134 matching lines @@
 bool PowerPrefsTest::GetExpectedAllowScreenWakeLocksForProfile(
     Profile* profile) const {
   return profile->GetPrefs()->GetBoolean(prefs::kPowerAllowScreenWakeLocks);
 }
 
 TEST_F(PowerPrefsTest, LoginScreen) {
   // Set up login profile.
   scoped_ptr<TestingPrefServiceSyncable> login_profile_prefs(
       new TestingPrefServiceSyncable);
   chrome::RegisterLoginProfilePrefs(login_profile_prefs->registry());
-  scoped_ptr<TestingProfile> login_profile_owner(new TestingProfile(
-      profile_manager_.profiles_dir().AppendASCII(chrome::kInitialProfile),
-      NULL,
-      scoped_refptr<ExtensionSpecialStoragePolicy>(),
-      scoped_ptr<PrefServiceSyncable>(login_profile_prefs.release())));
+  TestingProfile::Builder builder;
+  builder.SetPath(
+      profile_manager_.profiles_dir().AppendASCII(chrome::kInitialProfile));
+  builder.SetPrefService(login_profile_prefs.PassAs<PrefServiceSyncable>());
+  builder.SetIncognito();
+  scoped_ptr<TestingProfile> login_profile_owner = builder.Build();

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

scoped_ptr<TestingProfile> login_profile_owner(builder.Build());

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

Done, but is there a reason why this is better? I personally prefer the a = b
syntax for variable initialization, but I'm happy to be convinced that I'm Doing
It Wrong.

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

Guess it doesn't really matter too much. In an optimized build it's equiv. In a
debug build, because of the way move semantics are being emulated, I think this
will yield 2 extra type conversions. You're right though that it shouldn't
really matter.  Sorry for the noise.

+
   TestingProfile* login_profile = login_profile_owner.get();
   TestingProfile* login_profile_parent = profile_manager_.CreateTestingProfile(
       chrome::kInitialProfile);
-  login_profile_parent->SetOffTheRecordProfile(login_profile_owner.release());
+  login_profile_parent->SetOffTheRecordProfile(
+      login_profile_owner.PassAs<Profile>());
   login_profile->SetOriginalProfile(login_profile_parent);
-  login_profile->set_incognito(true);
 
   // Inform power_prefs_ that the login screen is being shown.
   power_prefs_->Observe(chrome::NOTIFICATION_LOGIN_OR_LOCK_WEBUI_VISIBLE,
                         content::Source<PowerPrefsTest>(this),
                         content::NotificationService::NoDetails());
 
   EXPECT_EQ(login_profile, GetProfile());
   EXPECT_EQ(GetExpectedPowerPolicyForProfile(login_profile),
             GetCurrentPowerPolicy());
   EXPECT_EQ(GetExpectedAllowScreenWakeLocksForProfile(login_profile),
@@ skipping 77 matching lines @@
                         content::Source<Profile>(user_profile),
                         content::NotificationService::NoDetails());
 
   EXPECT_FALSE(GetProfile());
   EXPECT_EQ(PowerPolicyController::GetPolicyDebugString(
                 power_manager::PowerManagementPolicy()),
             GetCurrentPowerPolicy());
 }
 
 }  // namespace chromeos