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

Unified Diff: chrome/common/content_settings_helper_unittest.cc

Issue 93793010: Update uses of UTF conversions in chrome/common 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/common/content_settings_helper.cc ('k') | chrome/common/extensions/api/commands/commands_handler.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/common/content_settings_helper_unittest.cc
diff --git a/chrome/common/content_settings_helper_unittest.cc b/chrome/common/content_settings_helper_unittest.cc
index 8ea861c82a63f4e0a086a78eec16a9159fc66f04..bea446c10aa7897d1b767d2fb29d5d4ccd6c0fd6 100644
--- a/chrome/common/content_settings_helper_unittest.cc
+++ b/chrome/common/content_settings_helper_unittest.cc
@@ -24,24 +24,24 @@ TEST(ContentSettingsHelperTest, OriginToString16) {
const GURL kUrl7("https://foo.com:81/bar");
// Now check the first group of urls with just "http":
- EXPECT_EQ(ASCIIToUTF16("www.foo.com"),
+ EXPECT_EQ(base::ASCIIToUTF16("www.foo.com"),
content_settings_helper::OriginToString16(kUrl0));
- EXPECT_EQ(ASCIIToUTF16("foo.com"),
+ EXPECT_EQ(base::ASCIIToUTF16("foo.com"),
content_settings_helper::OriginToString16(kUrl1));
- EXPECT_EQ(ASCIIToUTF16("www.foo.com:81"),
+ EXPECT_EQ(base::ASCIIToUTF16("www.foo.com:81"),
content_settings_helper::OriginToString16(kUrl2));
- EXPECT_EQ(ASCIIToUTF16("foo.com:81"),
+ EXPECT_EQ(base::ASCIIToUTF16("foo.com:81"),
content_settings_helper::OriginToString16(kUrl3));
// Now check the second group of urls with "https":
- EXPECT_EQ(ASCIIToUTF16("https://www.foo.com"),
+ EXPECT_EQ(base::ASCIIToUTF16("https://www.foo.com"),
content_settings_helper::OriginToString16(kUrl4));
- EXPECT_EQ(ASCIIToUTF16("https://foo.com"),
+ EXPECT_EQ(base::ASCIIToUTF16("https://foo.com"),
content_settings_helper::OriginToString16(kUrl5));
- EXPECT_EQ(ASCIIToUTF16("https://www.foo.com:81"),
+ EXPECT_EQ(base::ASCIIToUTF16("https://www.foo.com:81"),
content_settings_helper::OriginToString16(kUrl6));
- EXPECT_EQ(ASCIIToUTF16("https://foo.com:81"),
+ EXPECT_EQ(base::ASCIIToUTF16("https://foo.com:81"),
content_settings_helper::OriginToString16(kUrl7));
}
« no previous file with comments | « chrome/common/content_settings_helper.cc ('k') | chrome/common/extensions/api/commands/commands_handler.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698