chrome/browser/status_icons/status_tray_unittest.cc - Issue 120983002: Update some uses of UTF conversions in chrome/browser to use the base:: namespace.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/status_icons/status_tray_unittest.cc

Issue 120983002: 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

« no previous file with comments | « chrome/browser/status_icons/status_icon_menu_model_unittest.cc ('k') | chrome/browser/storage_monitor/media_storage_util_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/status_icons/status_tray_unittest.cc

diff --git a/chrome/browser/status_icons/status_tray_unittest.cc b/chrome/browser/status_icons/status_tray_unittest.cc

index b05cb1f82cb14209b5934b4ab2c4f15b01bbaf65..45066b75c72c67eaca4a693a62a8dcec49212c2c 100644

--- a/chrome/browser/status_icons/status_tray_unittest.cc

+++ b/chrome/browser/status_icons/status_tray_unittest.cc

@@ -41,7 +41,7 @@ TEST(StatusTrayTest, Create) {

ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();

gfx::ImageSkia* image = rb.GetImageSkiaNamed(IDR_STATUS_TRAY_ICON);

tray.CreateStatusIcon(

- StatusTray::OTHER_ICON, *image, ASCIIToUTF16("tool tip"));

+ StatusTray::OTHER_ICON, *image, base::ASCIIToUTF16("tool tip"));

EXPECT_EQ(1U, tray.GetStatusIconsForTest().size());

}

@@ -51,7 +51,7 @@ TEST(StatusTrayTest, CreateRemove) {

ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();

gfx::ImageSkia* image = rb.GetImageSkiaNamed(IDR_STATUS_TRAY_ICON);

StatusIcon* icon = tray.CreateStatusIcon(

- StatusTray::OTHER_ICON, *image, ASCIIToUTF16("tool tip"));

+ StatusTray::OTHER_ICON, *image, base::ASCIIToUTF16("tool tip"));

EXPECT_EQ(1U, tray.GetStatusIconsForTest().size());

tray.RemoveStatusIcon(icon);

EXPECT_EQ(0U, tray.GetStatusIconsForTest().size());