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

Unified Diff: chrome/browser/ui/cocoa/profiles/profile_chooser_controller_unittest.mm

Issue 1865213004: Convert //chrome/browser/ui 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
Index: chrome/browser/ui/cocoa/profiles/profile_chooser_controller_unittest.mm
diff --git a/chrome/browser/ui/cocoa/profiles/profile_chooser_controller_unittest.mm b/chrome/browser/ui/cocoa/profiles/profile_chooser_controller_unittest.mm
index 4f9d0416b269dc5dc8917c6e257177fd68fe2d14..2e3d1c43dd8cdcd9a07ca48c7317e47c463c0baf 100644
--- a/chrome/browser/ui/cocoa/profiles/profile_chooser_controller_unittest.mm
+++ b/chrome/browser/ui/cocoa/profiles/profile_chooser_controller_unittest.mm
@@ -4,11 +4,12 @@
#import "chrome/browser/ui/cocoa/profiles/profile_chooser_controller.h"
+#include <memory>
+
#include "base/command_line.h"
#import "base/mac/foundation_util.h"
#include "base/mac/scoped_nsobject.h"
#include "base/macros.h"
-#include "base/memory/scoped_ptr.h"
#include "base/strings/sys_string_conversions.h"
#include "base/strings/utf_string_conversions.h"
#include "chrome/browser/profiles/avatar_menu.h"
@@ -63,10 +64,10 @@ class ProfileChooserControllerTest : public CocoaProfileTest {
browser()->profile(), gcm::FakeGCMProfileService::Build);
testing_profile_manager()->CreateTestingProfile(
- "test1", scoped_ptr<syncable_prefs::PrefServiceSyncable>(),
+ "test1", std::unique_ptr<syncable_prefs::PrefServiceSyncable>(),
base::ASCIIToUTF16("Test 1"), 0, std::string(), testing_factories());
testing_profile_manager()->CreateTestingProfile(
- "test2", scoped_ptr<syncable_prefs::PrefServiceSyncable>(),
+ "test2", std::unique_ptr<syncable_prefs::PrefServiceSyncable>(),
base::ASCIIToUTF16("Test 2"), 1, std::string(),
TestingProfile::TestingFactories());
@@ -290,11 +291,11 @@ TEST_F(ProfileChooserControllerTest, OtherProfilesSortedAlphabetically) {
// Add two extra profiles, to make sure sorting is alphabetical and not
// by order of creation.
testing_profile_manager()->CreateTestingProfile(
- "test3", scoped_ptr<syncable_prefs::PrefServiceSyncable>(),
+ "test3", std::unique_ptr<syncable_prefs::PrefServiceSyncable>(),
base::ASCIIToUTF16("New Profile"), 1, std::string(),
TestingProfile::TestingFactories());
testing_profile_manager()->CreateTestingProfile(
- "test4", scoped_ptr<syncable_prefs::PrefServiceSyncable>(),
+ "test4", std::unique_ptr<syncable_prefs::PrefServiceSyncable>(),
base::ASCIIToUTF16("Another Test"), 1, std::string(),
TestingProfile::TestingFactories());
StartFastUserSwitcher();

Powered by Google App Engine
This is Rietveld 408576698