diff options
| author | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-24 23:12:15 +0000 |
|---|---|---|
| committer | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-24 23:12:15 +0000 |
| commit | cc2a2a22ebb171ff4c1eb528b3f8d7e551512732 (patch) | |
| tree | 9a010de6ab6210b43e4bc7cfa187ef3a80312a0b /chrome/browser/chromeos/file_manager/desktop_notifications_unittest.cc | |
| parent | 8af3b22a0f64133ba32f4deaedc6540060520ff7 (diff) | |
| download | chromium_src-cc2a2a22ebb171ff4c1eb528b3f8d7e551512732.zip chromium_src-cc2a2a22ebb171ff4c1eb528b3f8d7e551512732.tar.gz chromium_src-cc2a2a22ebb171ff4c1eb528b3f8d7e551512732.tar.bz2 | |
Revert 242455 "Revert 242449 "Update some uses of UTF conversion..."
> Revert 242449 "Update some uses of UTF conversions in chrome/bro..."
>
> > Update some uses of UTF conversions in chrome/browser to use the base:: namespace.
> >
> > BUG=330556
> > TEST=no change
> > TBR=ben@chromium.org
> >
> > Review URL: https://codereview.chromium.org/120943002
>
> TBR=avi@chromium.org
>
> Review URL: https://codereview.chromium.org/103853007
TBR=avi@chromium.org
Review URL: https://codereview.chromium.org/120993002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@242463 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/chromeos/file_manager/desktop_notifications_unittest.cc')
| -rw-r--r-- | chrome/browser/chromeos/file_manager/desktop_notifications_unittest.cc | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/chrome/browser/chromeos/file_manager/desktop_notifications_unittest.cc b/chrome/browser/chromeos/file_manager/desktop_notifications_unittest.cc index 7548d10..577c984 100644 --- a/chrome/browser/chromeos/file_manager/desktop_notifications_unittest.cc +++ b/chrome/browser/chromeos/file_manager/desktop_notifications_unittest.cc @@ -174,7 +174,7 @@ TEST(FileManagerMountNotificationsTest, UnsupportedDevice) { EXPECT_EQ(notification_path, notifications.params()[1].path); EXPECT_EQ( l10n_util::GetStringFUTF16(IDS_DEVICE_UNSUPPORTED_MESSAGE, - UTF8ToUTF16(device_label)), + base::UTF8ToUTF16(device_label)), notifications.params()[1].message); } @@ -226,7 +226,7 @@ TEST(FileManagerMountNotificationsTest, UnsupportedWithUnknownParent) { EXPECT_EQ(notification_path, notifications.params()[3].path); EXPECT_EQ( l10n_util::GetStringFUTF16(IDS_DEVICE_UNSUPPORTED_MESSAGE, - UTF8ToUTF16(device_label)), + base::UTF8ToUTF16(device_label)), notifications.params()[3].message); } @@ -266,7 +266,7 @@ TEST(FileManagerMountNotificationsTest, MountPartialSuccess) { EXPECT_EQ(notification_path, notifications.params()[1].path); EXPECT_EQ( l10n_util::GetStringFUTF16(IDS_MULTIPART_DEVICE_UNSUPPORTED_MESSAGE, - UTF8ToUTF16(device_label)), + base::UTF8ToUTF16(device_label)), notifications.params()[1].message); } @@ -298,7 +298,7 @@ TEST(FileManagerMountNotificationsTest, Unknown) { EXPECT_EQ(notification_path, notifications.params()[1].path); EXPECT_EQ( l10n_util::GetStringFUTF16(IDS_DEVICE_UNKNOWN_MESSAGE, - UTF8ToUTF16(device_label)), + base::UTF8ToUTF16(device_label)), notifications.params()[1].message); } @@ -331,7 +331,7 @@ TEST(FileManagerMountNotificationsTest, NonASCIILabel) { EXPECT_EQ(notification_path, notifications.params()[1].path); EXPECT_EQ( l10n_util::GetStringFUTF16(IDS_DEVICE_UNKNOWN_MESSAGE, - UTF8ToUTF16(device_label)), + base::UTF8ToUTF16(device_label)), notifications.params()[1].message); } @@ -363,7 +363,7 @@ TEST(FileManagerMountNotificationsTest, MulitpleFail) { EXPECT_EQ(notification_path, notifications.params()[1].path); EXPECT_EQ( l10n_util::GetStringFUTF16(IDS_DEVICE_UNKNOWN_MESSAGE, - UTF8ToUTF16(device_label)), + base::UTF8ToUTF16(device_label)), notifications.params()[1].message); notifications.ManageNotificationsOnMountCompleted( @@ -386,7 +386,7 @@ TEST(FileManagerMountNotificationsTest, MulitpleFail) { EXPECT_EQ(notification_path, notifications.params()[3].path); EXPECT_EQ( l10n_util::GetStringFUTF16(IDS_DEVICE_UNKNOWN_MESSAGE, - UTF8ToUTF16(device_label)), + base::UTF8ToUTF16(device_label)), notifications.params()[3].message); notifications.ManageNotificationsOnMountCompleted( @@ -409,7 +409,7 @@ TEST(FileManagerMountNotificationsTest, MulitpleFail) { EXPECT_EQ(notification_path, notifications.params()[5].path); EXPECT_EQ( l10n_util::GetStringFUTF16(IDS_MULTIPART_DEVICE_UNSUPPORTED_MESSAGE, - UTF8ToUTF16(device_label)), + base::UTF8ToUTF16(device_label)), notifications.params()[5].message); notifications.ManageNotificationsOnMountCompleted( |