Revert 242454 "Revert 242450 "Update some uses of UTF conversion..."
> Revert 242450 "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
> > [email protected]
> >
> > Review URL: https://codereview.chromium.org/120953002
>
> [email protected]
>
> Review URL: https://codereview.chromium.org/107423005
[email protected]
Review URL: https://codereview.chromium.org/121003002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@242464 0039d316-1c4b-4281-b951-d872f2087c98
diff --git a/chrome/browser/extensions/convert_web_app_unittest.cc b/chrome/browser/extensions/convert_web_app_unittest.cc
index f2e550d..fcf8f9fd 100644
--- a/chrome/browser/extensions/convert_web_app_unittest.cc
+++ b/chrome/browser/extensions/convert_web_app_unittest.cc
@@ -99,8 +99,9 @@
WebApplicationInfo web_app;
web_app.manifest_url = GURL("http://aaronboodman.com/gearpad/manifest.json");
- web_app.title = ASCIIToUTF16("Gearpad");
- web_app.description = ASCIIToUTF16("The best text editor in the universe!");
+ web_app.title = base::ASCIIToUTF16("Gearpad");
+ web_app.description =
+ base::ASCIIToUTF16("The best text editor in the universe!");
web_app.app_url = GURL("http://aaronboodman.com/gearpad/");
web_app.permissions.push_back("geolocation");
web_app.permissions.push_back("notifications");
@@ -129,8 +130,8 @@
extension->public_key());
EXPECT_EQ("ncnbaadanljoanockmphfdkimpdedemj", extension->id());
EXPECT_EQ("1978.12.11.0", extension->version()->GetString());
- EXPECT_EQ(UTF16ToUTF8(web_app.title), extension->name());
- EXPECT_EQ(UTF16ToUTF8(web_app.description), extension->description());
+ EXPECT_EQ(base::UTF16ToUTF8(web_app.title), extension->name());
+ EXPECT_EQ(base::UTF16ToUTF8(web_app.description), extension->description());
EXPECT_EQ(web_app.app_url, AppLaunchInfo::GetFullLaunchURL(extension.get()));
EXPECT_EQ(2u, extension->GetActivePermissions()->apis().size());
EXPECT_TRUE(extension->HasAPIPermission("geolocation"));
@@ -160,7 +161,7 @@
WebApplicationInfo web_app;
web_app.manifest_url = GURL("http://aaronboodman.com/gearpad/manifest.json");
- web_app.title = ASCIIToUTF16("Gearpad");
+ web_app.title = base::ASCIIToUTF16("Gearpad");
web_app.app_url = GURL("http://aaronboodman.com/gearpad/");
scoped_refptr<Extension> extension = ConvertWebAppToExtension(
@@ -179,7 +180,7 @@
extension->public_key());
EXPECT_EQ("ncnbaadanljoanockmphfdkimpdedemj", extension->id());
EXPECT_EQ("1978.12.11.0", extension->version()->GetString());
- EXPECT_EQ(UTF16ToUTF8(web_app.title), extension->name());
+ EXPECT_EQ(base::UTF16ToUTF8(web_app.title), extension->name());
EXPECT_EQ("", extension->description());
EXPECT_EQ(web_app.app_url, AppLaunchInfo::GetFullLaunchURL(extension.get()));
EXPECT_EQ(0u, IconsInfo::GetIcons(extension.get()).map().size());
