Cleanup various Windows installer/breakpad bits.

chrome/installer/util/google_update_settings.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.
 
 #include "chrome/installer/util/google_update_settings.h"
 
 #include <algorithm>
 #include <string>
 
 #include "base/command_line.h"
@@ skipping 149 matching lines @@
     return false;
   }
 
   if (!channel_info.GetChannelName(channel)) {
     channel->assign(installer::kChromeChannelUnknown);
   }
 
   // Tag the channel name if this is a multi-install.
   if (add_multi_modifier && channel_info.IsMultiInstall()) {
     if (!channel->empty()) {
-      channel->append(1, L'-');
+      channel->push_back(L'-');
     }
-    channel->append(1, L'm');
+    channel->push_back(L'm');
   }
 
   return true;
 }
 
 // Populates |update_policy| with the UpdatePolicy enum value corresponding to a
 // DWORD read from the registry and returns true if |value| is within range.
 // If |value| is out of range, returns false without modifying |update_policy|.
 bool GetUpdatePolicyFromDword(
     const DWORD value,
@@ skipping 219 matching lines @@
 bool GoogleUpdateSettings::UpdateDidRunStateForDistribution(
     BrowserDistribution* dist,
     bool did_run,
     bool system_level) {
   return WriteGoogleUpdateStrKeyMultiInstall(dist,
                                              google_update::kRegDidRunField,
                                              did_run ? L"1" : L"0",
                                              system_level);
 }
 
-std::wstring GoogleUpdateSettings::GetChromeChannel(bool system_install) {
-  std::wstring channel;
+base::string16 GoogleUpdateSettings::GetChromeChannel(bool system_install) {
+  base::string16 channel;
   GetChromeChannelInternal(system_install, false, &channel);
   return channel;
 }
 
 bool GoogleUpdateSettings::GetChromeChannelAndModifiers(
     bool system_install,
     base::string16* channel) {
   return GetChromeChannelInternal(system_install, true, channel);
 }
 
@@ skipping 436 matching lines @@
   }
 
   // If the key or value was not present, return the empty string.
   if (result == ERROR_FILE_NOT_FOUND || result == ERROR_PATH_NOT_FOUND) {
     experiment_labels->clear();
     return true;
   }
 
   return result == ERROR_SUCCESS;
 }