Moving Breakpad Windows specific logic to lower layer.

chrome/browser/ui/webui/settings/system_handler.cc

Index: chrome/browser/ui/webui/settings/system_handler.cc
diff --git a/chrome/browser/ui/webui/settings/system_handler.cc b/chrome/browser/ui/webui/settings/system_handler.cc
index bbfedae9735e9a5ef39e3a42fa340f506c777b92..bb264b49aacf781563e88c8ce600fbad767b9fcc 100644
--- a/chrome/browser/ui/webui/settings/system_handler.cc
+++ b/chrome/browser/ui/webui/settings/system_handler.cc
@@ -4,10 +4,6 @@
 
 #include "chrome/browser/ui/webui/settings/system_handler.h"
 
-#if defined(OS_WIN)
-#include <windows.h>
-#endif
-
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/metrics/user_metrics.h"
@@ -19,11 +15,6 @@
 #include "content/public/browser/web_ui.h"
 #include "content/public/browser/web_ui_data_source.h"
 
-#if defined(OS_WIN)
-#include "chrome/browser/metrics/chrome_metrics_service_accessor.h"
-#include "chrome/common/chrome_constants.h"
-#endif
-
 namespace settings {
 
 SystemHandler::SystemHandler() {}
@@ -51,23 +42,6 @@ void SystemHandler::HandleChangeProxySettings(const base::ListValue* /*args*/) {
 }
 
 void SystemHandler::HandleRestartBrowser(const base::ListValue* /*args*/) {
-#if defined(OS_WIN)
-  // On Windows Breakpad will upload crash reports if the breakpad pipe name
-  // environment variable is defined. So we undefine this environment variable
-  // before restarting, as the restarted processes will inherit their
-  // environment variables from ours, thus suppressing crash uploads.
-  if (!ChromeMetricsServiceAccessor::IsMetricsAndCrashReportingEnabled()) {
-    HMODULE exe_module = GetModuleHandle(chrome::kBrowserProcessExecutableName);
-    if (exe_module) {
-      typedef void (__cdecl *ClearBreakpadPipeEnvVar)();
-      ClearBreakpadPipeEnvVar clear = reinterpret_cast<ClearBreakpadPipeEnvVar>(
-          GetProcAddress(exe_module, "ClearBreakpadPipeEnvironmentVariable"));
-      if (clear)
-        clear();
-    }
-  }
-#endif
-
   chrome::AttemptRestart();
 }