summaryrefslogtreecommitdiffstats
path: root/chrome/browser/notifications/desktop_notifications_unittest.cc
diff options
context:
space:
mode:
authoravi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-12-24 20:09:37 +0000
committeravi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-12-24 20:09:37 +0000
commit6778feddfd9451088649a5b42de79d032832e4ee (patch)
tree5967444597de6ebe7abd308db0f1d10790a4bfd4 /chrome/browser/notifications/desktop_notifications_unittest.cc
parent12ea28018c67f906ecbdc51324c0e0a3dcf02245 (diff)
downloadchromium_src-6778feddfd9451088649a5b42de79d032832e4ee.zip
chromium_src-6778feddfd9451088649a5b42de79d032832e4ee.tar.gz
chromium_src-6778feddfd9451088649a5b42de79d032832e4ee.tar.bz2
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/106543008 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@242453 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/notifications/desktop_notifications_unittest.cc')
-rw-r--r--chrome/browser/notifications/desktop_notifications_unittest.cc22
1 files changed, 11 insertions, 11 deletions
diff --git a/chrome/browser/notifications/desktop_notifications_unittest.cc b/chrome/browser/notifications/desktop_notifications_unittest.cc
index 6531c3f..2632a87 100644
--- a/chrome/browser/notifications/desktop_notifications_unittest.cc
+++ b/chrome/browser/notifications/desktop_notifications_unittest.cc
@@ -156,8 +156,8 @@ DesktopNotificationsTest::StandardTestNotification() {
params.notification_id = 0;
params.origin = GURL("http://www.google.com");
params.icon_url = GURL("/icon.png");
- params.title = ASCIIToUTF16("Title");
- params.body = ASCIIToUTF16("Text");
+ params.title = base::ASCIIToUTF16("Title");
+ params.body = base::ASCIIToUTF16("Text");
params.direction = blink::WebTextDirectionDefault;
return params;
}
@@ -176,7 +176,7 @@ TEST_F(DesktopNotificationsTest, TestShow) {
StandardTestNotification();
params2.notification_id = 2;
params2.origin = GURL("http://www.google.com");
- params2.body = ASCIIToUTF16("Text");
+ params2.body = base::ASCIIToUTF16("Text");
EXPECT_TRUE(service_->ShowDesktopNotification(
params2, 0, 0, DesktopNotificationService::PageNotification));
@@ -264,11 +264,11 @@ TEST_F(DesktopNotificationsTest, TestVariableSize) {
content::ShowDesktopNotificationHostMsgParams params;
params.origin = GURL("http://long.google.com");
params.icon_url = GURL("/icon.png");
- params.title = ASCIIToUTF16("Really Really Really Really Really Really "
- "Really Really Really Really Really Really "
- "Really Really Really Really Really Really "
- "Really Long Title"),
- params.body = ASCIIToUTF16("Text");
+ params.title = base::ASCIIToUTF16("Really Really Really Really Really Really "
+ "Really Really Really Really Really Really "
+ "Really Really Really Really Really Really "
+ "Really Long Title"),
+ params.body = base::ASCIIToUTF16("Text");
params.notification_id = 0;
std::string expected_log;
@@ -279,7 +279,7 @@ TEST_F(DesktopNotificationsTest, TestVariableSize) {
expected_log.append("notification displayed\n");
params.origin = GURL("http://short.google.com");
- params.title = ASCIIToUTF16("Short title");
+ params.title = base::ASCIIToUTF16("Short title");
params.notification_id = 1;
EXPECT_TRUE(service_->ShowDesktopNotification(
params, 0, 0, DesktopNotificationService::PageNotification));
@@ -457,8 +457,8 @@ TEST_F(DesktopNotificationsTest, TestUserInputEscaping) {
// data:// URL that's produced for the balloon.
content::ShowDesktopNotificationHostMsgParams params =
StandardTestNotification();
- params.title = ASCIIToUTF16("<script>window.alert('uh oh');</script>");
- params.body = ASCIIToUTF16("<i>this text is in italics</i>");
+ params.title = base::ASCIIToUTF16("<script>window.alert('uh oh');</script>");
+ params.body = base::ASCIIToUTF16("<i>this text is in italics</i>");
params.notification_id = 1;
EXPECT_TRUE(service_->ShowDesktopNotification(
params, 0, 0, DesktopNotificationService::PageNotification));