Cleanup various Windows installer/breakpad bits.

chrome/app/chrome_breakpad_client.cc

 // Copyright 2013 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/app/chrome_breakpad_client.h"
 
 #include "base/atomicops.h"
 #include "base/command_line.h"
 #include "base/environment.h"
 #include "base/files/file_path.h"
@@ skipping 11 matching lines @@
 #include "chrome/common/env_vars.h"
 #include "chrome/installer/util/google_update_settings.h"
 
 #if defined(OS_WIN)
 #include <windows.h>
 
 #include "base/file_version_info.h"
 #include "base/win/registry.h"
 #include "chrome/installer/util/google_chrome_sxs_distribution.h"
 #include "chrome/installer/util/install_util.h"
+#include "chrome/installer/util/util_constants.h"
 #include "policy/policy_constants.h"
 #endif
 
 #if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_IOS)
 #include "chrome/browser/crash_upload_list.h"
 #include "chrome/common/chrome_version_info_posix.h"
 #endif
 
 #if defined(OS_POSIX)
 #include "base/debug/dump_without_crashing.h"
@@ skipping 77 matching lines @@
       version->append(base::ASCIIToUTF16("-devel"));
 
     *product_name = version_info->product_short_name();
     *special_build = version_info->special_build();
   } else {
     // No version info found. Make up the values.
     *product_name = base::ASCIIToUTF16("Chrome");
     *version = base::ASCIIToUTF16("0.0.0.0-devel");
   }
 
-  std::wstring channel_string;
   GoogleUpdateSettings::GetChromeChannelAndModifiers(
-      !GetIsPerUserInstall(exe_path), &channel_string);
-  *channel_name = base::WideToUTF16(channel_string);
+      !GetIsPerUserInstall(exe_path), channel_name);
 }
 
 bool ChromeBreakpadClient::ShouldShowRestartDialog(base::string16* title,
                                                    base::string16* message,
                                                    bool* is_rtl_locale) {
   scoped_ptr<base::Environment> env(base::Environment::Create());
   if (!env->HasVar(env_vars::kShowRestart) ||
       !env->HasVar(env_vars::kRestartInfo) ||
       env->HasVar(env_vars::kMetroConnected)) {
     return false;
@@ skipping 35 matching lines @@
     return false;
 
   return true;
 }
 
 bool ChromeBreakpadClient::GetIsPerUserInstall(const base::FilePath& exe_path) {
   return InstallUtil::IsPerUserInstall(exe_path.value().c_str());
 }
 
 bool ChromeBreakpadClient::GetShouldDumpLargerDumps(bool is_per_user_install) {
-  base::string16 channel_name(base::WideToUTF16(
-      GoogleUpdateSettings::GetChromeChannel(!is_per_user_install)));
+  base::string16 channel_name =
+      GoogleUpdateSettings::GetChromeChannel(!is_per_user_install);
 
   // Capture more detail in crash dumps for beta and dev channel builds.
-  if (channel_name == base::ASCIIToUTF16("dev") ||
-      channel_name == base::ASCIIToUTF16("beta") ||
-      channel_name == GoogleChromeSxSDistribution::ChannelName())
-    return true;
-  return false;
+  return (channel_name == installer::kChromeChannelDev ||
+          channel_name == installer::kChromeChannelBeta ||
+          channel_name == GoogleChromeSxSDistribution::ChannelName());
 }
 
 int ChromeBreakpadClient::GetResultCodeRespawnFailed() {
   return chrome::RESULT_CODE_RESPAWN_FAILED;
 }
 
 void ChromeBreakpadClient::InitBrowserCrashDumpsRegKey() {
   DCHECK(g_browser_crash_dump_regkey == NULL);
 
   base::win::RegKey regkey;
@@ skipping 66 matching lines @@
 
   base::win::RegKey hkcu_policy_key(HKEY_CURRENT_USER,
                                     policy::kRegistryChromePolicyKey, KEY_READ);
   if (hkcu_policy_key.ReadValueDW(key_name.c_str(), &value) == ERROR_SUCCESS) {
     *breakpad_enabled = value != 0;
     return true;
   }
 
   return false;
 }
-#endif
+#endif  // defined(OS_WIN)
 
 #if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_IOS)
 void ChromeBreakpadClient::GetProductNameAndVersion(std::string* product_name,
                                                     std::string* version) {
   DCHECK(product_name);
   DCHECK(version);
 #if defined(OS_ANDROID)
   *product_name = "Chrome_Android";
 #elif defined(OS_CHROMEOS)
   *product_name = "Chrome_ChromeOS";
@@ skipping 78 matching lines @@
 bool ChromeBreakpadClient::EnableBreakpadForProcess(
     const std::string& process_type) {
   return process_type == switches::kRendererProcess ||
          process_type == switches::kPluginProcess ||
          process_type == switches::kPpapiPluginProcess ||
          process_type == switches::kZygoteProcess ||
          process_type == switches::kGpuProcess;
 }
 
 }  // namespace chrome