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

Unified Diff: chrome/browser/storage_monitor/storage_monitor_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
Index: chrome/browser/storage_monitor/storage_monitor_linux_unittest.cc
diff --git a/chrome/browser/storage_monitor/storage_monitor_linux_unittest.cc b/chrome/browser/storage_monitor/storage_monitor_linux_unittest.cc
index 4a161d2bab60010e33e8371432e5e2fef22c2853..d63c12d2b5ee2165dbb6a73d8b26e777f1f3276f 100644
--- a/chrome/browser/storage_monitor/storage_monitor_linux_unittest.cc
+++ b/chrome/browser/storage_monitor/storage_monitor_linux_unittest.cc
@@ -90,9 +90,9 @@ scoped_ptr<StorageInfo> GetDeviceInfo(const base::FilePath& device_path,
StorageInfo::MakeDeviceId(type, kTestDeviceData[i].unique_id),
base::string16(),
mount_point.value(),
- ASCIIToUTF16("volume label"),
- ASCIIToUTF16("vendor name"),
- ASCIIToUTF16("model name"),
+ base::ASCIIToUTF16("volume label"),
+ base::ASCIIToUTF16("vendor name"),
+ base::ASCIIToUTF16("model name"),
kTestDeviceData[i].partition_size_in_bytes));
return storage_info.Pass();
}
@@ -612,9 +612,9 @@ TEST_F(StorageMonitorLinuxTest, DeviceLookUp) {
EXPECT_EQ(test_path_a.value(), device_info.location());
EXPECT_EQ(base::string16(), device_info.name());
EXPECT_EQ(88788ULL, device_info.total_size_in_bytes());
- EXPECT_EQ(ASCIIToUTF16("volume label"), device_info.storage_label());
- EXPECT_EQ(ASCIIToUTF16("vendor name"), device_info.vendor_name());
- EXPECT_EQ(ASCIIToUTF16("model name"), device_info.model_name());
+ EXPECT_EQ(base::ASCIIToUTF16("volume label"), device_info.storage_label());
+ EXPECT_EQ(base::ASCIIToUTF16("vendor name"), device_info.vendor_name());
+ EXPECT_EQ(base::ASCIIToUTF16("model name"), device_info.model_name());
EXPECT_TRUE(notifier()->GetStorageInfoForPath(test_path_b, &device_info));
EXPECT_EQ(GetDeviceId(kDeviceNoDCIM), device_info.device_id());
« no previous file with comments | « chrome/browser/storage_monitor/storage_monitor_linux.cc ('k') | chrome/browser/storage_monitor/storage_monitor_mac.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698