Moving Breakpad Windows specific logic to lower layer.

chrome/browser/lifetime/application_lifetime.cc

Index: chrome/browser/lifetime/application_lifetime.cc
diff --git a/chrome/browser/lifetime/application_lifetime.cc b/chrome/browser/lifetime/application_lifetime.cc
index 8c6adaebb8fdeafad4431f446d61f7cfd0e5d644..729d04ede88ce1891ad678b563548235fe225efa 100644
--- a/chrome/browser/lifetime/application_lifetime.cc
+++ b/chrome/browser/lifetime/application_lifetime.cc
@@ -6,6 +6,10 @@
 
 #include <memory>
 
+#if defined(OS_WIN)
+#include <windows.h>
+#endif
+
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/message_loop/message_loop.h"
@@ -47,6 +51,8 @@
 
 #if defined(OS_WIN)
 #include "base/win/win_util.h"
+#include "chrome/browser/metrics/chrome_metrics_service_accessor.h"
+#include "chrome/common/chrome_constants.h"
 #endif
 
 namespace chrome {
@@ -188,6 +194,23 @@ void AttemptUserExit() {
 // The Android implementation is in application_lifetime_android.cc
 #if !defined(OS_ANDROID)
 void AttemptRestart() {
+#if defined(OS_WIN)
+  // On Windows Breakpad will upload crash reports if the breakpad pipe name

[Lei Zhang, 2016/06/06 22:56:15]

there's a missing comma after "Windows"

[dpapad, 2016/06/06 23:14:37]

Done.

+  // 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)();

[Sigurður Ásgeirsson, 2016/06/06 13:40:01]

these in-place function type declarations irk me. I know you're just shuffling
code here, but perhaps you could pull these type declarations out to a common
header?
It's then possible to make the function type matching break at compile-time by
e.g. assigning the exported function to a variable of this type...

[dpapad, 2016/06/06 17:09:45]

I prefer to leave this cleanup to someone with a Windows workstation (and more
Windows dev experience). Since I don't have one, the development cycle is pretty
long (uploading my changes, triggering the trybots, waiting for the results).

+      ClearBreakpadPipeEnvVar clear = reinterpret_cast<ClearBreakpadPipeEnvVar>(
+          GetProcAddress(exe_module, "ClearBreakpadPipeEnvironmentVariable"));
+      if (clear)
+        clear();
+    }
+  }
+#endif  // defined(OS_WIN)
+
   // TODO(beng): Can this use ProfileManager::GetLoadedProfiles instead?
   for (auto* browser : *BrowserList::GetInstance())
     content::BrowserContext::SaveSessionState(browser->profile());
@@ -210,7 +233,7 @@ void AttemptRestart() {
   AttemptExit();
 #endif
 }
-#endif
+#endif  // !defined(OS_ANDROID)
 
 void AttemptExit() {
 #if defined(OS_CHROMEOS)