Cleanup various Windows installer/breakpad bits.

chrome/installer/util/google_update_settings.h

 // 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.
 
 #ifndef CHROME_INSTALLER_UTIL_GOOGLE_UPDATE_SETTINGS_H_
 #define CHROME_INSTALLER_UTIL_GOOGLE_UPDATE_SETTINGS_H_
 
 #include <string>
 
 #include "base/basictypes.h"
@@ skipping 149 matching lines @@
 
   // Set did_run "dr" in the client state value for |dist|. This is used to
   // measure active users. Returns false if writting to the registry failed.
   static bool UpdateDidRunStateForDistribution(BrowserDistribution* dist,
                                                bool did_run,
                                                bool system_level);
 
   // Returns only the channel name: "" (stable), "dev", "beta", "canary", or
   // "unknown" if unknown. This value will not be modified by "-m" for a
   // multi-install. See kChromeChannel* in util_constants.h
-  static std::wstring GetChromeChannel(bool system_install);
+  static base::string16 GetChromeChannel(bool system_install);
 
   // Return a human readable modifier for the version string, e.g.
   // the channel (dev, beta, stable). Returns true if this operation succeeded,
   // on success, channel contains one of "", "unknown", "dev" or "beta" (unless
   // it is a multi-install product, in which case it will return "m",
   // "unknown-m", "dev-m", or "beta-m").
   static bool GetChromeChannelAndModifiers(bool system_install,
                                            base::string16* channel);
 
   // This method changes the Google Update "ap" value to move the installation
@@ skipping 123 matching lines @@
   // this will do nothing to |experiment_labels|. This will return true if the
   // label did not exist, or was successfully read.
   static bool ReadExperimentLabels(bool system_install,
                                    base::string16* experiment_labels);
 
  private:
   DISALLOW_IMPLICIT_CONSTRUCTORS(GoogleUpdateSettings);
 };
 
 #endif  // CHROME_INSTALLER_UTIL_GOOGLE_UPDATE_SETTINGS_H_