Revert 184352

chrome/installer/util/google_chrome_distribution.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 //
 // This file defines specific implementation of BrowserDistribution class for
 // Google Chrome.
 
 #include "chrome/installer/util/google_chrome_distribution.h"
 
 #include <windows.h>
@@ skipping 282 matching lines @@
 
 bool GoogleChromeDistribution::BuildUninstallMetricsString(
     const DictionaryValue* uninstall_metrics_dict, string16* metrics) {
   DCHECK(NULL != metrics);
   bool has_values = false;
 
   for (DictionaryValue::Iterator iter(*uninstall_metrics_dict); !iter.IsAtEnd();
        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;
 }
 
 bool GoogleChromeDistribution::ExtractUninstallMetricsFromFile(
     const base::FilePath& file_path,
     string16* uninstall_metrics_string) {
   JSONFileValueSerializer json_serializer(file_path);
 
@@ skipping 56 matching lines @@
       version_number.major, version_number.minor, version_number.build);
 
   base::FilePath iexplore;
   if (!PathService::Get(base::DIR_PROGRAM_FILES, &iexplore))
     return;
 
   iexplore = iexplore.AppendASCII("Internet Explorer");
   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;
   if (ExtractUninstallMetricsFromFile(local_data_path, &uninstall_metrics)) {
     // The user has opted into anonymous usage data collection, so append
     // metrics and distribution data.
     command += uninstall_metrics;
     if (!distribution_data.empty()) {
       command += L"&";
       command += distribution_data;
@@ skipping 257 matching lines @@
       { { IDS_TRY_TOAST_HEADING3, kMakeDefault },
         { 0, 0 },
         { 0, 0 },
         { 0, 0 }
       }
     }
   };
 
   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;
     base::SplitString(kExperiments[i].brands, L',', &brand_codes);
     if (brand_codes.empty())
       return false;
     for (std::vector<string16>::iterator it = brand_codes.begin();
          it != brand_codes.end(); ++it) {
       if (*it != brand && *it != L"*")
         continue;
@@ skipping 118 matching lines @@
   VLOG(1) << "User drafted for toast experiment " << flavor;
   SetClient(base_group + kToastExpBaseGroup, false);
   // User level: The experiment needs to be performed in a different process
   // because google_update expects the upgrade process to be quick and nimble.
   // System level: We have already been relaunched, so we don't need to be
   // quick, but we relaunch to follow the exact same codepath.
   CommandLine cmd_line(setup_path);
   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);
 }
 
 // User qualifies for the experiment. To test, use --try-chrome-again=|flavor|
 // as a parameter to chrome.exe.
 void GoogleChromeDistribution::InactiveUserToastExperiment(int flavor,
     const string16& experiment_group,
     const installer::Product& installation,
     const base::FilePath& application_path) {
   // Add the 'welcome back' url for chrome to show.
@@ skipping 41 matching lines @@
       installer::switches::kSystemLevelToast);
 
   CommandLine cmd(InstallUtil::GetChromeUninstallCmd(system_level_toast,
                                                      GetType()));
   base::LaunchProcess(cmd, base::LaunchOptions(), NULL);
 }
 
 bool GoogleChromeDistribution::ShouldSetExperimentLabels() {
   return true;
 }