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

Index: chrome/browser/storage_monitor/storage_monitor_unittest.cc

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

index 427c9d7306431e7cde27e89c2cf5abc12f3e4578..8466108771c1f16ea32141bcb2ae24a54b25ac36 100644

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

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

@@ -34,7 +34,7 @@ TEST(StorageMonitorTest, TestInitialize) {

TEST(StorageMonitorTest, DeviceAttachDetachNotifications) {

TestStorageMonitor::RemoveSingleton();

base::MessageLoop message_loop;

- const base::string16 kDeviceName = ASCIIToUTF16("media device");

+ const base::string16 kDeviceName = base::ASCIIToUTF16("media device");

const std::string kDeviceId1 = "dcim:UUID:FFF0-0001";

const std::string kDeviceId2 = "dcim:UUID:FFF0-0002";

MockRemovableStorageObserver observer1;

@@ -92,7 +92,7 @@ TEST(StorageMonitorTest, GetAllAvailableStorageAttachDetach) {

base::MessageLoop message_loop;

TestStorageMonitor monitor;

const std::string kDeviceId1 = "dcim:UUID:FFF0-0042";

- const base::string16 kDeviceName1 = ASCIIToUTF16("test");

+ const base::string16 kDeviceName1 = base::ASCIIToUTF16("test");

const base::FilePath kDevicePath1(FILE_PATH_LITERAL("/testfoo"));

StorageInfo info1(kDeviceId1, kDeviceName1, kDevicePath1.value(),

base::string16(), base::string16(), base::string16(), 0);

@@ -105,7 +105,7 @@ TEST(StorageMonitorTest, GetAllAvailableStorageAttachDetach) {

EXPECT_EQ(kDevicePath1.value(), devices[0].location());

const std::string kDeviceId2 = "dcim:UUID:FFF0-0044";

- const base::string16 kDeviceName2 = ASCIIToUTF16("test2");

+ const base::string16 kDeviceName2 = base::ASCIIToUTF16("test2");

const base::FilePath kDevicePath2(FILE_PATH_LITERAL("/testbar"));

StorageInfo info2(kDeviceId2, kDeviceName2, kDevicePath2.value(),

base::string16(), base::string16(), base::string16(), 0);