chrome/browser/storage_monitor/media_transfer_protocol_device_observer_linux_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/storage_monitor/media_transfer_protocol_device_observer_linux_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/storage_monitor/media_transfer_protocol_device_observer_linux.cc ('k') | chrome/browser/storage_monitor/portable_device_watcher_win.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/storage_monitor/media_transfer_protocol_device_observer_linux_unittest.cc

diff --git a/chrome/browser/storage_monitor/media_transfer_protocol_device_observer_linux_unittest.cc b/chrome/browser/storage_monitor/media_transfer_protocol_device_observer_linux_unittest.cc

index d3e63d52bd82691c50566908f1593815d67c4617..45f84b4996853c76505a3e3e56daea027a00f7f5 100644

--- a/chrome/browser/storage_monitor/media_transfer_protocol_device_observer_linux_unittest.cc

+++ b/chrome/browser/storage_monitor/media_transfer_protocol_device_observer_linux_unittest.cc

@@ -47,7 +47,7 @@ void GetStorageInfo(const std::string& storage_name,

ASSERT_EQ(kStorageWithValidInfo, storage_name);

*id = GetMtpDeviceId(kStorageUniqueId);

- *label = ASCIIToUTF16(kStorageLabel);

+ *label = base::ASCIIToUTF16(kStorageLabel);

*location = kStorageLocation;

}

@@ -135,7 +135,8 @@ TEST_F(MediaTransferProtocolDeviceObserverLinuxTest, BasicAttachDetach) {

EXPECT_EQ(1, observer().attach_calls());

EXPECT_EQ(0, observer().detach_calls());

EXPECT_EQ(device_id, observer().last_attached().device_id());

- EXPECT_EQ(ASCIIToUTF16(kStorageLabel), observer().last_attached().name());

+ EXPECT_EQ(base::ASCIIToUTF16(kStorageLabel),

+ observer().last_attached().name());

EXPECT_EQ(kStorageLocation, observer().last_attached().location());

// Detach the attached storage.