Revert of Remove dependencies on chrome\installer from the ChromeCrashReporterClient class on Windows.

chrome_elf/breakpad.cc

 // Copyright 2014 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 module contains the necessary code to register the Breakpad exception
 // handler. This implementation is based on Chrome's crash reporting code.
 
 #include "chrome_elf/breakpad.h"
 
 #include <sddl.h>
 
 #include "base/macros.h"
-#include "base/strings/string16.h"
 #include "breakpad/src/client/windows/handler/exception_handler.h"
 #include "chrome/common/chrome_version.h"
 #include "chrome/install_static/install_util.h"
 
 google_breakpad::ExceptionHandler* g_elf_breakpad = NULL;
 
 namespace {
 
 const wchar_t kBreakpadProductName[] = L"Chrome";
 const wchar_t kBreakpadVersionEntry[] = L"ver";
 const wchar_t kBreakpadProdEntry[] = L"prod";
 const wchar_t kBreakpadPlatformEntry[] = L"plat";
 const wchar_t kBreakpadPlatformWin32[] = L"Win32";
 const wchar_t kBreakpadProcessEntry[] = L"ptype";
 const wchar_t kBreakpadChannelEntry[] = L"channel";
 
 // The protocol for connecting to the out-of-process Breakpad crash
 // reporter is different for x86-32 and x86-64: the message sizes
 // are different because the message struct contains a pointer.  As
 // a result, there are two different named pipes to connect to.  The
 // 64-bit one is distinguished with an "-x64" suffix.
 const wchar_t kChromePipeName[] = L"\\\\.\\pipe\\ChromeCrashServices\\";
 const wchar_t kGoogleUpdatePipeName[] = L"\\\\.\\pipe\\GoogleCrashServices\\";
 const wchar_t kSystemPrincipalSid[] = L"S-1-5-18";
 
 const wchar_t kNoErrorDialogs[] = L"noerrdialogs";
 
 google_breakpad::CustomClientInfo* GetCustomInfo() {
-  base::string16 process =
-      install_static::IsNonBrowserProcess() ? L"renderer" : L"browser";
+  base::string16 process = IsNonBrowserProcess() ? L"renderer" : L"browser";
 
   wchar_t exe_path[MAX_PATH] = {};
   base::string16 channel;
   if (GetModuleFileName(NULL, exe_path, arraysize(exe_path)) &&
-      install_static::IsSxSChrome(exe_path)) {
+      IsCanary(exe_path)) {
     channel = L"canary";
   }
 
   static google_breakpad::CustomInfoEntry ver_entry(
       kBreakpadVersionEntry, TEXT(CHROME_VERSION_STRING));
   static google_breakpad::CustomInfoEntry prod_entry(
       kBreakpadProdEntry, kBreakpadProductName);
   static google_breakpad::CustomInfoEntry plat_entry(
       kBreakpadPlatformEntry, kBreakpadPlatformWin32);
   static google_breakpad::CustomInfoEntry proc_entry(
@@ skipping 82 matching lines @@
 
 #if defined(GOOGLE_CHROME_BUILD) && defined(OFFICIAL_BUILD)
   bool is_official_chrome_build = true;
 #else
   bool is_official_chrome_build = false;
 #endif
 
   base::string16 pipe_name;
 
   bool enabled_by_policy = false;
-  bool use_policy =
-      install_static::ReportingIsEnforcedByPolicy(&enabled_by_policy);
+  bool use_policy = ReportingIsEnforcedByPolicy(&enabled_by_policy);
 
   if (!use_policy && IsHeadless()) {
     pipe_name = kChromePipeName;
-  } else if (use_policy ? enabled_by_policy
-                        : (is_official_chrome_build &&
-                           install_static::GetCollectStatsConsent())) {
+  } else if (use_policy ?
+                 enabled_by_policy :
+                 (is_official_chrome_build && AreUsageStatsEnabled(exe_path))) {
     // Build the pipe name. It can be one of:
     // 32-bit system: \\.\pipe\GoogleCrashServices\S-1-5-18
     // 32-bit user: \\.\pipe\GoogleCrashServices\<user SID>
     // 64-bit system: \\.\pipe\GoogleCrashServices\S-1-5-18-x64
     // 64-bit user: \\.\pipe\GoogleCrashServices\<user SID>-x64
-    base::string16 user_sid = install_static::IsSystemInstall(exe_path)
-                                  ? kSystemPrincipalSid
-                                  : GetUserSidString();
+    base::string16 user_sid = IsSystemInstall(exe_path) ? kSystemPrincipalSid :
+                                                          GetUserSidString();
     if (user_sid.empty())
       return;
 
     pipe_name = kGoogleUpdatePipeName;
     pipe_name += user_sid;
 
 #if defined(_WIN64)
     pipe_name += L"-x64";
 #endif
   } else {
@@ skipping 10 matching lines @@
       google_breakpad::ExceptionHandler::HANDLER_ALL,
       dump_type,
       pipe_name.c_str(),
       GetCustomInfo());
 
   if (g_elf_breakpad->IsOutOfProcess()) {
     // Tells breakpad to handle breakpoint and single step exceptions.
     g_elf_breakpad->set_handle_debug_exceptions(true);
   }
 }