Cleanup: Replace most base::ASCIIToWide with base::ASCIIToUTF16 in chrome/browser.

BUG=23581

Review URL: https://codereview.chromium.org/717783003

Cr-Commit-Position: refs/heads/master@{#305485}

12 files changed, 45 insertions, 46 deletions

diff --git a/chrome/browser/about_flags_unittest.cc b/chrome/browser/about_flags_unittest.cc
index 32fb1de..19e0b65 100644
--- a/chrome/browser/about_flags_unittest.cc
+++ b/chrome/browser/about_flags_unittest.cc
@@ -548,9 +548,9 @@ TEST_F(AboutFlagsTest, CheckValues) {
                                     std::string(kSwitch1) +
                                     std::string("=");
 #if defined(OS_WIN)
-  EXPECT_EQ(std::wstring::npos,
+  EXPECT_EQ(base::string16::npos,
             command_line.GetCommandLineString().find(
-                base::ASCIIToWide(switch1_with_equals)));
+                base::ASCIIToUTF16(switch1_with_equals)));
 #else
   EXPECT_EQ(std::string::npos,
             command_line.GetCommandLineString().find(switch1_with_equals));
@@ -561,9 +561,9 @@ TEST_F(AboutFlagsTest, CheckValues) {
                                     std::string(kSwitch2) +
                                     std::string("=");
 #if defined(OS_WIN)
-  EXPECT_NE(std::wstring::npos,
+  EXPECT_NE(base::string16::npos,
             command_line.GetCommandLineString().find(
-                base::ASCIIToWide(switch2_with_equals)));
+                base::ASCIIToUTF16(switch2_with_equals)));
 #else
   EXPECT_NE(std::string::npos,
             command_line.GetCommandLineString().find(switch2_with_equals));
diff --git a/chrome/browser/content_settings/content_settings_browsertest.cc b/chrome/browser/content_settings/content_settings_browsertest.cc
index 9a8e424..7952ee9 100644
--- a/chrome/browser/content_settings/content_settings_browsertest.cc
+++ b/chrome/browser/content_settings/content_settings_browsertest.cc
@@ -594,17 +594,15 @@ class PepperContentSettingsSpecialCasesTest : public ContentSettingsTest {
     EXPECT_TRUE(base::PathExists(plugin_lib));
 
     base::FilePath::StringType pepper_plugin = plugin_lib.value();
-    pepper_plugin.append(FILE_PATH_LITERAL("#"));
-#if defined(OS_WIN)
-    pepper_plugin.append(base::ASCIIToWide(display_name));
-#else
-    pepper_plugin.append(display_name);
-#endif
-    pepper_plugin.append(FILE_PATH_LITERAL("#A CDM#0.1.0.0;"));
+    std::string string_to_append = "#";
+    string_to_append.append(display_name);
+    string_to_append.append("#A CDM#0.1.0.0;");
+    string_to_append.append(mime_type);
+
 #if defined(OS_WIN)
-    pepper_plugin.append(base::ASCIIToWide(mime_type));
+    pepper_plugin.append(base::ASCIIToUTF16(string_to_append));
 #else
-    pepper_plugin.append(mime_type);
+    pepper_plugin.append(string_to_append);
 #endif
 
     return pepper_plugin;
diff --git a/chrome/browser/enumerate_modules_model_win.cc b/chrome/browser/enumerate_modules_model_win.cc
index e69f37f..c5d3943 100644
--- a/chrome/browser/enumerate_modules_model_win.cc
+++ b/chrome/browser/enumerate_modules_model_win.cc
@@ -865,16 +865,16 @@ base::ListValue* EnumerateModulesModel::GetModuleList() const {
     if ((module->type & ModuleEnumerator::LOADED_MODULE) == 0) {
       // Module is not loaded, denote type of module.
       if (module->type & ModuleEnumerator::SHELL_EXTENSION)
-        type_string = base::ASCIIToWide("Shell Extension");
+        type_string = L"Shell Extension";
       if (module->type & ModuleEnumerator::WINSOCK_MODULE_REGISTRATION) {
         if (!type_string.empty())
-          type_string += base::ASCIIToWide(", ");
-        type_string += base::ASCIIToWide("Winsock");
+          type_string += L", ";
+        type_string += L"Winsock";
       }
       // Must be one of the above type.
       DCHECK(!type_string.empty());
       if (!limited_mode_) {
-        type_string += base::ASCIIToWide(" -- ");
+        type_string += L" -- ";
         type_string += l10n_util::GetStringUTF16(IDS_CONFLICTS_NOT_LOADED_YET);
       }
     }
@@ -890,10 +890,10 @@ base::ListValue* EnumerateModulesModel::GetModuleList() const {
     if (!limited_mode_) {
       // Figure out the possible resolution help string.
       base::string16 actions;
-      base::string16 separator = base::ASCIIToWide(" ") +
+      base::string16 separator = L" " +
           l10n_util::GetStringUTF16(
               IDS_CONFLICTS_CHECK_POSSIBLE_ACTION_SEPARATOR) +
-          base::ASCIIToWide(" ");
+          L" ";
 
       if (module->recommended_action & ModuleEnumerator::INVESTIGATING) {
         actions = l10n_util::GetStringUTF16(
@@ -918,12 +918,12 @@ base::ListValue* EnumerateModulesModel::GetModuleList() const {
               IDS_CONFLICTS_CHECK_POSSIBLE_ACTION_DISABLE);
         }
       }
-      base::string16 possible_resolution =
-          actions.empty() ? base::ASCIIToWide("")
-                          : l10n_util::GetStringUTF16(
-                                IDS_CONFLICTS_CHECK_POSSIBLE_ACTIONS) +
-          base::ASCIIToWide(" ") +
-          actions;
+      base::string16 possible_resolution;
+      if (!actions.empty()) {
+        possible_resolution =
+            l10n_util::GetStringUTF16(IDS_CONFLICTS_CHECK_POSSIBLE_ACTIONS) +
+            L" " + actions;
+      }
       data->SetString("possibleResolution", possible_resolution);
       data->SetString("help_url",
                       ConstructHelpCenterUrl(*module).spec().c_str());
diff --git a/chrome/browser/extensions/external_registry_loader_win.cc b/chrome/browser/extensions/external_registry_loader_win.cc
index ce61b27..a1c2893 100644
--- a/chrome/browser/extensions/external_registry_loader_win.cc
+++ b/chrome/browser/extensions/external_registry_loader_win.cc
@@ -25,19 +25,20 @@ using content::BrowserThread;
 namespace {
 
 // The Registry subkey that contains information about external extensions.
-const char kRegistryExtensions[] = "Software\\Google\\Chrome\\Extensions";
+const base::char16 kRegistryExtensions[] =
+    L"Software\\Google\\Chrome\\Extensions";
 
 // Registry value of the key that defines the installation parameter.
-const wchar_t kRegistryExtensionInstallParam[] = L"install_parameter";
+const base::char16 kRegistryExtensionInstallParam[] = L"install_parameter";
 
 // Registry value of the key that defines the path to the .crx file.
-const wchar_t kRegistryExtensionPath[] = L"path";
+const base::char16 kRegistryExtensionPath[] = L"path";
 
 // Registry value of that key that defines the current version of the .crx file.
-const wchar_t kRegistryExtensionVersion[] = L"version";
+const base::char16 kRegistryExtensionVersion[] = L"version";
 
 // Registry value of the key that defines an external update URL.
-const wchar_t kRegistryExtensionUpdateUrl[] = L"update_url";
+const base::char16 kRegistryExtensionUpdateUrl[] = L"update_url";
 
 bool CanOpenFileForReading(const base::FilePath& path) {
   base::ScopedFILE file_handle(base::OpenFile(path, "rb"));
@@ -69,12 +70,12 @@ void ExternalRegistryLoader::LoadOnFileThread() {
   std::set<base::string16> keys;
   base::win::RegistryKeyIterator iterator_machine_key(
       HKEY_LOCAL_MACHINE,
-      base::ASCIIToWide(kRegistryExtensions).c_str(),
+      kRegistryExtensions,
       KEY_WOW64_32KEY);
   for (; iterator_machine_key.Valid(); ++iterator_machine_key)
     keys.insert(iterator_machine_key.Name());
   base::win::RegistryKeyIterator iterator_user_key(
-      HKEY_CURRENT_USER, base::ASCIIToWide(kRegistryExtensions).c_str());
+      HKEY_CURRENT_USER, kRegistryExtensions);
   for (; iterator_user_key.Valid(); ++iterator_user_key)
     keys.insert(iterator_user_key.Name());
 
@@ -84,7 +85,7 @@ void ExternalRegistryLoader::LoadOnFileThread() {
   for (std::set<base::string16>::const_iterator it = keys.begin();
        it != keys.end(); ++it) {
     base::win::RegKey key;
-    base::string16 key_path = base::ASCIIToWide(kRegistryExtensions);
+    base::string16 key_path = kRegistryExtensions;
     key_path.append(L"\\");
     key_path.append(*it);
     if (key.Open(HKEY_LOCAL_MACHINE,
diff --git a/chrome/browser/media/encrypted_media_browsertest.cc b/chrome/browser/media/encrypted_media_browsertest.cc
index 7797730..ae27e70 100644
--- a/chrome/browser/media/encrypted_media_browsertest.cc
+++ b/chrome/browser/media/encrypted_media_browsertest.cc
@@ -257,7 +257,7 @@ class EncryptedMediaTestBase : public MediaBrowserTest {
       RegisterPepperCdm(command_line, kClearKeyCdmAdapterFileName, key_system);
     }
 #if defined(WIDEVINE_CDM_AVAILABLE) && defined(WIDEVINE_CDM_IS_COMPONENT)
-    else if (IsWidevine(key_system)) {
+    else if (IsWidevine(key_system)) {  // NOLINT
       RegisterPepperCdm(command_line, kWidevineCdmAdapterFileName, key_system);
     }
 #endif  // defined(WIDEVINE_CDM_AVAILABLE) && defined(WIDEVINE_CDM_IS_COMPONENT)
@@ -281,7 +281,7 @@ class EncryptedMediaTestBase : public MediaBrowserTest {
     base::FilePath::StringType pepper_plugin = plugin_lib.value();
     pepper_plugin.append(FILE_PATH_LITERAL("#CDM#0.1.0.0;"));
 #if defined(OS_WIN)
-    pepper_plugin.append(base::ASCIIToWide(GetPepperType(key_system)));
+    pepper_plugin.append(base::ASCIIToUTF16(GetPepperType(key_system)));
 #else
     pepper_plugin.append(GetPepperType(key_system));
 #endif
diff --git a/chrome/browser/media/encrypted_media_istypesupported_browsertest.cc b/chrome/browser/media/encrypted_media_istypesupported_browsertest.cc
index 91b725e..d725ad1 100644
--- a/chrome/browser/media/encrypted_media_istypesupported_browsertest.cc
+++ b/chrome/browser/media/encrypted_media_istypesupported_browsertest.cc
@@ -214,7 +214,7 @@ class EncryptedMediaIsTypeSupportedTest : public InProcessBrowserTest {
     base::FilePath::StringType pepper_plugin = plugin_lib.value();
     pepper_plugin.append(FILE_PATH_LITERAL("#CDM#0.1.0.0;"));
 #if defined(OS_WIN)
-    pepper_plugin.append(base::ASCIIToWide(pepper_type_for_key_system));
+    pepper_plugin.append(base::ASCIIToUTF16(pepper_type_for_key_system));
 #else
     pepper_plugin.append(pepper_type_for_key_system);
 #endif
diff --git a/chrome/browser/memory_details_win.cc b/chrome/browser/memory_details_win.cc
index b580cd5..27e2d55 100644
--- a/chrome/browser/memory_details_win.cc
+++ b/chrome/browser/memory_details_win.cc
@@ -124,7 +124,7 @@ void MemoryDetails::CollectProcessData(
       TCHAR name[MAX_PATH];
       if (index2 == CHROME_BROWSER || index2 == CHROME_NACL_PROCESS) {
         chrome::VersionInfo version_info;
-        info.version = base::ASCIIToWide(version_info.Version());
+        info.version = base::ASCIIToUTF16(version_info.Version());
         // Check if this is one of the child processes whose data we collected
         // on the IO thread, and if so copy over that data.
         for (size_t child = 0; child < child_info.size(); child++) {
diff --git a/chrome/browser/password_manager/password_store_win.cc b/chrome/browser/password_manager/password_store_win.cc
index e2c5d6a..ad6264e 100644
--- a/chrome/browser/password_manager/password_store_win.cc
+++ b/chrome/browser/password_manager/password_store_win.cc
@@ -114,7 +114,7 @@ std::vector<PasswordForm*> PasswordStoreWin::DBHandler::GetIE7Results(
     // table.
     web_data_service_->RemoveIE7Login(info);
     std::vector<ie7_password::DecryptedCredentials> credentials;
-    std::wstring url = base::ASCIIToWide(form.origin.spec());
+    base::string16 url = base::ASCIIToUTF16(form.origin.spec());
     if (ie7_password::DecryptPasswords(url,
                                        info.encrypted_data,
                                        &credentials)) {
diff --git a/chrome/browser/platform_util_win.cc b/chrome/browser/platform_util_win.cc
index 657e80c..b14602f 100644
--- a/chrome/browser/platform_util_win.cc
+++ b/chrome/browser/platform_util_win.cc
@@ -114,8 +114,8 @@ void ShowItemInFolderOnFileThread(const base::FilePath& full_path) {
 // is empty. This function tells if it is.
 bool ValidateShellCommandForScheme(const std::string& scheme) {
   base::win::RegKey key;
-  std::wstring registry_path = base::ASCIIToWide(scheme) +
-                               L"\\shell\\open\\command";
+  base::string16 registry_path = base::ASCIIToUTF16(scheme) +
+                                 L"\\shell\\open\\command";
   key.Open(HKEY_CLASSES_ROOT, registry_path.c_str(), KEY_READ);
   if (!key.Valid())
     return false;
diff --git a/chrome/browser/policy/policy_path_parser_win.cc b/chrome/browser/policy/policy_path_parser_win.cc
index 71c9011..90dc30c4 100644
--- a/chrome/browser/policy/policy_path_parser_win.cc
+++ b/chrome/browser/policy/policy_path_parser_win.cc
@@ -18,8 +18,8 @@ namespace {
 
 // Checks if the key exists in the given hive and expands any string variables.
 bool LoadUserDataDirPolicyFromRegistry(HKEY hive, base::FilePath* dir) {
-  std::wstring value;
-  std::wstring key_name(base::ASCIIToWide(policy::key::kUserDataDir));
+  base::string16 value;
+  base::string16 key_name(base::ASCIIToUTF16(policy::key::kUserDataDir));
   base::win::RegKey key(hive, policy::kRegistryChromePolicyKey, KEY_READ);
   if (key.ReadValue(key_name.c_str(), &value) == ERROR_SUCCESS) {
     *dir = base::FilePath(policy::path_parser::ExpandPathVariables(value));
diff --git a/chrome/browser/shell_integration_win.cc b/chrome/browser/shell_integration_win.cc
index 539c88c..614167a 100644
--- a/chrome/browser/shell_integration_win.cc
+++ b/chrome/browser/shell_integration_win.cc
@@ -181,7 +181,7 @@ void MigrateChromiumShortcutsCallback() {
 // be retrieved in the HKCR registry subkey method implemented below. We call
 // AssocQueryString with the new Win8-only flag ASSOCF_IS_PROTOCOL instead.
 base::string16 GetAppForProtocolUsingAssocQuery(const GURL& url) {
-  base::string16 url_scheme = base::ASCIIToWide(url.scheme());
+  base::string16 url_scheme = base::ASCIIToUTF16(url.scheme());
   // Don't attempt to query protocol association on an empty string.
   if (url_scheme.empty())
     return base::string16();
@@ -206,9 +206,9 @@ base::string16 GetAppForProtocolUsingAssocQuery(const GURL& url) {
 }
 
 base::string16 GetAppForProtocolUsingRegistry(const GURL& url) {
-  base::string16 url_spec = base::ASCIIToWide(url.possibly_invalid_spec());
+  base::string16 url_spec = base::ASCIIToUTF16(url.possibly_invalid_spec());
   const base::string16 cmd_key_path =
-      base::ASCIIToWide(url.scheme() + "\\shell\\open\\command");
+      base::ASCIIToUTF16(url.scheme() + "\\shell\\open\\command");
   base::win::RegKey cmd_key(HKEY_CLASSES_ROOT,
                             cmd_key_path.c_str(),
                             KEY_READ);
diff --git a/chrome/browser/ui/startup/startup_browser_creator_impl.cc b/chrome/browser/ui/startup/startup_browser_creator_impl.cc
index 6abbea5..5924fe1 100644
--- a/chrome/browser/ui/startup/startup_browser_creator_impl.cc
+++ b/chrome/browser/ui/startup/startup_browser_creator_impl.cc
@@ -146,7 +146,7 @@ LaunchMode GetLaunchShortcutKind() {
     std::string appdata_path;
     env->GetVar("USERPROFILE", &appdata_path);
     if (!appdata_path.empty() &&
-        shortcut.find(base::ASCIIToWide(appdata_path)) != std::wstring::npos)
+        shortcut.find(base::ASCIIToUTF16(appdata_path)) != base::string16::npos)
       return LM_SHORTCUT_DESKTOP;
     return LM_SHORTCUT_UNKNOWN;
   }