Revert 184352

chrome/installer/util/google_chrome_distribution.cc

Index: chrome/installer/util/google_chrome_distribution.cc
===================================================================
--- chrome/installer/util/google_chrome_distribution.cc	(revision 184354)
+++ chrome/installer/util/google_chrome_distribution.cc	(working copy)
@@ -300,12 +300,12 @@
        iter.Advance()) {
     has_values = true;
     metrics->append(L"&");
-    metrics->append(base::UTF8ToWide(iter.key()));
+    metrics->append(UTF8ToWide(iter.key()));
     metrics->append(L"=");
 
     std::string value;
     iter.value().GetAsString(&value);
-    metrics->append(base::UTF8ToWide(value));
+    metrics->append(UTF8ToWide(value));
   }
 
   return has_values;
@@ -382,8 +382,7 @@
   iexplore = iexplore.AppendASCII("iexplore.exe");
 
   string16 command = iexplore.value() + L" " + GetUninstallSurveyUrl() +
-      L"&" + kVersionParam + L"=" +
-      base::UTF8ToWide(version.GetString()) + L"&" +
+      L"&" + kVersionParam + L"=" + UTF8ToWide(version.GetString()) + L"&" +
       kOSParam + L"=" + os_version;
 
   string16 uninstall_metrics;
@@ -661,18 +660,16 @@
 
   string16 locale;
   GoogleUpdateSettings::GetLanguage(&locale);
-  if (locale.empty() || (locale == base::ASCIIToWide("en")))
-    locale = base::ASCIIToWide("en-US");
+  if (locale.empty() || (locale == ASCIIToWide("en")))
+    locale = ASCIIToWide("en-US");
 
   string16 brand;
-  if (!GoogleUpdateSettings::GetBrand(&brand)) {
-    // Could still be viable for catch-all rules.
-    brand = base::ASCIIToWide("");
-  }
+  if (!GoogleUpdateSettings::GetBrand(&brand))
+    brand = ASCIIToWide("");  // Could still be viable for catch-all rules.
 
   for (int i = 0; i < arraysize(kExperiments); ++i) {
     if (kExperiments[i].locale != locale &&
-        kExperiments[i].locale != base::ASCIIToWide("*"))
+        kExperiments[i].locale != ASCIIToWide("*"))
       continue;
 
     std::vector<string16> brand_codes;
@@ -811,7 +808,7 @@
   cmd_line.AppendSwitchASCII(installer::switches::kInactiveUserToast,
                              base::IntToString(flavor));
   cmd_line.AppendSwitchASCII(installer::switches::kExperimentGroup,
-                             base::WideToASCII(base_group));
+                             WideToASCII(base_group));
   LaunchSetup(&cmd_line, product, system_level);
 }