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

Unified Diff: chrome/browser/ui/cocoa/browser/avatar_menu_bubble_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/avatar_menu_bubble_controller_unittest.mm
diff --git a/chrome/browser/ui/cocoa/browser/avatar_menu_bubble_controller_unittest.mm b/chrome/browser/ui/cocoa/browser/avatar_menu_bubble_controller_unittest.mm
index 7f4a8b43befedf8b9f20f23ec513d1b90c5a7588..705d148aeece3c363550fd09698bf9a388189d9c 100644
--- a/chrome/browser/ui/cocoa/browser/avatar_menu_bubble_controller_unittest.mm
+++ b/chrome/browser/ui/cocoa/browser/avatar_menu_bubble_controller_unittest.mm
@@ -30,10 +30,12 @@ class AvatarMenuBubbleControllerTest : public CocoaTest {
ASSERT_TRUE(manager_.SetUp());
manager_.CreateTestingProfile("test1", scoped_ptr<PrefServiceSyncable>(),
- ASCIIToUTF16("Test 1"), 1, std::string(),
+ base::ASCIIToUTF16("Test 1"), 1,
+ std::string(),
TestingProfile::TestingFactories());
manager_.CreateTestingProfile("test2", scoped_ptr<PrefServiceSyncable>(),
- ASCIIToUTF16("Test 2"), 0, std::string(),
+ base::ASCIIToUTF16("Test 2"), 0,
+ std::string(),
TestingProfile::TestingFactories());
menu_ = new AvatarMenu(manager_.profile_info_cache(), NULL, NULL);
@@ -124,7 +126,8 @@ TEST_F(AvatarMenuBubbleControllerTest, PerformLayout) {
// Now create a new profile and notify the delegate.
manager()->CreateTestingProfile("test3", scoped_ptr<PrefServiceSyncable>(),
- ASCIIToUTF16("Test 3"), 0, std::string(),
+ base::ASCIIToUTF16("Test 3"), 0,
+ std::string(),
TestingProfile::TestingFactories());
// Testing the bridge is not worth the effort...

Powered by Google App Engine
This is Rietveld 408576698