Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1890)

Unified Diff: chrome/browser/chromeos/power/power_prefs_unittest.cc

Issue 1870793002: Convert //chrome/browser/chromeos from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/chromeos/power/power_prefs.h ('k') | chrome/browser/chromeos/power/renderer_freezer.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chromeos/power/power_prefs_unittest.cc
diff --git a/chrome/browser/chromeos/power/power_prefs_unittest.cc b/chrome/browser/chromeos/power/power_prefs_unittest.cc
index af14476d0fd27023159f4f2f10736401f9164ca8..a4b18b8a6b043c5e112223c2f6beb1fc394dd273 100644
--- a/chrome/browser/chromeos/power/power_prefs_unittest.cc
+++ b/chrome/browser/chromeos/power/power_prefs_unittest.cc
@@ -66,9 +66,9 @@ class PowerPrefsTest : public testing::Test {
content::TestBrowserThreadBundle thread_bundle_;
TestingProfileManager profile_manager_;
PowerPolicyController* power_policy_controller_; // Not owned.
- scoped_ptr<FakePowerManagerClient> fake_power_manager_client_;
+ std::unique_ptr<FakePowerManagerClient> fake_power_manager_client_;
- scoped_ptr<PowerPrefs> power_prefs_;
+ std::unique_ptr<PowerPrefs> power_prefs_;
DISALLOW_COPY_AND_ASSIGN(PowerPrefsTest);
};
@@ -174,8 +174,8 @@ bool PowerPrefsTest::GetExpectedAllowScreenWakeLocksForProfile(
TEST_F(PowerPrefsTest, LoginScreen) {
// Set up login profile.
- scoped_ptr<syncable_prefs::TestingPrefServiceSyncable> login_profile_prefs(
- new syncable_prefs::TestingPrefServiceSyncable);
+ std::unique_ptr<syncable_prefs::TestingPrefServiceSyncable>
+ login_profile_prefs(new syncable_prefs::TestingPrefServiceSyncable);
chrome::RegisterLoginProfilePrefs(login_profile_prefs->registry());
TestingProfile::Builder builder;
builder.SetPath(
« no previous file with comments | « chrome/browser/chromeos/power/power_prefs.h ('k') | chrome/browser/chromeos/power/renderer_freezer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698