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

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

Issue 112913004: Update some uses of UTF conversions in chrome/browser to use the base:: namespace. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years 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/browser/profile_chooser_controller_unittest.mm
diff --git a/chrome/browser/ui/cocoa/browser/profile_chooser_controller_unittest.mm b/chrome/browser/ui/cocoa/browser/profile_chooser_controller_unittest.mm
index e5dc04e8c1a1d8fe4af251d8db86bb50c9f84e71..b0f42153b3bc7736ece65b513032345edc4a90df 100644
--- a/chrome/browser/ui/cocoa/browser/profile_chooser_controller_unittest.mm
+++ b/chrome/browser/ui/cocoa/browser/profile_chooser_controller_unittest.mm
@@ -22,11 +22,11 @@ class ProfileChooserControllerTest : public CocoaProfileTest {
testing_profile_manager()->
CreateTestingProfile("test1", scoped_ptr<PrefServiceSyncable>(),
- ASCIIToUTF16("Test 1"), 0, std::string(),
+ base::ASCIIToUTF16("Test 1"), 0, std::string(),
TestingProfile::TestingFactories());
testing_profile_manager()->
CreateTestingProfile("test2", scoped_ptr<PrefServiceSyncable>(),
- ASCIIToUTF16("Test 2"), 1, std::string(),
+ base::ASCIIToUTF16("Test 2"), 1, std::string(),
TestingProfile::TestingFactories());
menu_ = new AvatarMenu(testing_profile_manager()->profile_info_cache(),
@@ -129,7 +129,7 @@ TEST_F(ProfileChooserControllerTest, LocalProfileActiveCardLinks) {
TEST_F(ProfileChooserControllerTest, SignedInProfileActiveCardLinks) {
// Sign in the first profile.
ProfileInfoCache* cache = testing_profile_manager()->profile_info_cache();
- cache->SetUserNameOfProfileAtIndex(0, ASCIIToUTF16("user_name"));
+ cache->SetUserNameOfProfileAtIndex(0, base::ASCIIToUTF16("user_name"));
StartProfileChooserController();
NSArray* subviews = [[[controller() window] contentView] subviews];

Powered by Google App Engine
This is Rietveld 408576698