Revert 184352

> Add utf_string_conversions to base namespace.
> 
> This adds "using"s for all functions so those can be fixed in a separate pass.
> 
> This converts the "Wide" versions of the functions in the Chrome directory as a first pass on the changeover.
> 
> BUG=
> 
> Review URL: https://codereview.chromium.org/12314090

TBR=brettw@chromium.org
Review URL: https://codereview.chromium.org/12315071

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@184355 0039d316-1c4b-4281-b951-d872f2087c98

4 files changed, 16 insertions, 19 deletions

diff --git a/chrome/installer/setup/chrome_frame_ready_mode.cc b/chrome/installer/setup/chrome_frame_ready_mode.cc
index 62bcb64..c8a98c4 100644
--- a/chrome/installer/setup/chrome_frame_ready_mode.cc
+++ b/chrome/installer/setup/chrome_frame_ready_mode.cc
@@ -215,8 +215,7 @@ InstallStatus ChromeFrameReadyModeEndTempOptOut(
   HKEY root = installer_state.root_key();
 
   std::wstring chrome_frame_ua_value_name(kChromeFramePrefix);
-  chrome_frame_ua_value_name +=
-      base::ASCIIToWide(installed_version.GetString());
+  chrome_frame_ua_value_name += ASCIIToWide(installed_version.GetString());
 
   // Store the Chrome Frame user agent string
   item_list->AddSetRegValueWorkItem(root, kPostPlatformUAKey,
diff --git a/chrome/installer/setup/install_worker.cc b/chrome/installer/setup/install_worker.cc
index 90297d2..5450e32 100644
--- a/chrome/installer/setup/install_worker.cc
+++ b/chrome/installer/setup/install_worker.cc
@@ -245,7 +245,7 @@ void AddCommandWithParameterWorkItems(const InstallerState& installer_state,
   if (installer_state.operation() == InstallerState::UNINSTALL) {
     work_item_list->AddDeleteRegKeyWorkItem(
         installer_state.root_key(), full_cmd_key)->set_log_message(
-            "removing " + base::WideToASCII(command_key) + " command");
+            "removing " + WideToASCII(command_key) + " command");
   } else {
     CommandLine cmd_line(installer_state.target_path().Append(app));
     cmd_line.AppendSwitchASCII(command_with_parameter, "%1");
@@ -750,16 +750,14 @@ void AddUninstallShortcutWorkItems(const InstallerState& installer_state,
                                          L"Publisher",
                                          browser_dist->GetPublisherName(),
                                          true);
-    install_list->AddSetRegValueWorkItem(
-        reg_root, uninstall_reg,
-        L"Version",
-        base::ASCIIToWide(new_version.GetString()),
-        true);
-    install_list->AddSetRegValueWorkItem(
-        reg_root, uninstall_reg,
-        L"DisplayVersion",
-        base::ASCIIToWide(new_version.GetString()),
-        true);
+    install_list->AddSetRegValueWorkItem(reg_root, uninstall_reg,
+                                         L"Version",
+                                         ASCIIToWide(new_version.GetString()),
+                                         true);
+    install_list->AddSetRegValueWorkItem(reg_root, uninstall_reg,
+                                         L"DisplayVersion",
+                                         ASCIIToWide(new_version.GetString()),
+                                         true);
     install_list->AddSetRegValueWorkItem(reg_root, uninstall_reg,
                                          L"InstallDate",
                                          InstallUtil::GetCurrentDate(),
@@ -808,7 +806,7 @@ void AddVersionKeyWorkItems(HKEY root,
   }
   list->AddSetRegValueWorkItem(root, version_key,
                                google_update::kRegVersionField,
-                               base::ASCIIToWide(new_version.GetString()),
+                               ASCIIToWide(new_version.GetString()),
                                true);  // overwrite version
 }
 
@@ -1072,12 +1070,12 @@ bool AppendPostInstallTasks(const InstallerState& installer_state,
       if (current_version) {
         in_use_update_work_items->AddSetRegValueWorkItem(root, version_key,
             google_update::kRegOldVersionField,
-            base::ASCIIToWide(current_version->GetString()), true);
+            ASCIIToWide(current_version->GetString()), true);
       }
       if (critical_version.IsValid()) {
         in_use_update_work_items->AddSetRegValueWorkItem(root, version_key,
             google_update::kRegCriticalVersionField,
-            base::ASCIIToWide(critical_version.GetString()), true);
+            ASCIIToWide(critical_version.GetString()), true);
       } else {
         in_use_update_work_items->AddDeleteRegValueWorkItem(root, version_key,
             google_update::kRegCriticalVersionField);
@@ -1684,7 +1682,7 @@ void AddQuickEnableChromeFrameWorkItems(const InstallerState& installer_state,
     // isn't installed since we don't want them left behind in any case.
     work_item_list->AddDeleteRegKeyWorkItem(
         installer_state.root_key(), cmd_key)->set_log_message(
-            "removing " + base::WideToASCII(kCmdQuickEnableCf) + " command");
+            "removing " + WideToASCII(kCmdQuickEnableCf) + " command");
 
   } else if (will_have_chrome_binaries) {
     // Chrome Frame isn't (to be) installed while some other multi-install
diff --git a/chrome/installer/setup/setup_util.cc b/chrome/installer/setup/setup_util.cc
index b60a39d..9f112c0 100644
--- a/chrome/installer/setup/setup_util.cc
+++ b/chrome/installer/setup/setup_util.cc
@@ -138,7 +138,7 @@ Version* GetMaxVersionFromArchiveDir(const base::FilePath& chrome_path) {
     VLOG(1) << "directory found: " << find_data.cFileName;
 
     scoped_ptr<Version> found_version(
-        new Version(base::WideToASCII(find_data.cFileName)));
+        new Version(WideToASCII(find_data.cFileName)));
     if (found_version->IsValid() &&
         found_version->CompareTo(*max_version.get()) > 0) {
       max_version.reset(found_version.release());
diff --git a/chrome/installer/setup/uninstall.cc b/chrome/installer/setup/uninstall.cc
index b74e906..2458eef 100644
--- a/chrome/installer/setup/uninstall.cc
+++ b/chrome/installer/setup/uninstall.cc
@@ -191,7 +191,7 @@ void ClearRlzProductState() {
   // If chrome has been reactivated, clear all events for this brand as well.
   string16 reactivation_brand_wide;
   if (GoogleUpdateSettings::GetReactivationBrand(&reactivation_brand_wide)) {
-    std::string reactivation_brand(base::WideToASCII(reactivation_brand_wide));
+    std::string reactivation_brand(WideToASCII(reactivation_brand_wide));
     rlz_lib::SupplementaryBranding branding(reactivation_brand.c_str());
     rlz_lib::ClearProductState(rlz_lib::CHROME, points);
   }