Crashpad Windows: Use the Crashpad client instead of Breakpad on Windows

chrome/app/chrome_main_delegate.cc

Index: chrome/app/chrome_main_delegate.cc
diff --git a/chrome/app/chrome_main_delegate.cc b/chrome/app/chrome_main_delegate.cc
index b6c7bac122185d0b94c9d53b9d8d86c0fd028c67..e9a126b6fbe62ff1fd944a9d577497e3cf5be9b3 100644
--- a/chrome/app/chrome_main_delegate.cc
+++ b/chrome/app/chrome_main_delegate.cc
@@ -56,6 +56,7 @@
 #include "chrome/app/close_handle_hook_win.h"
 #include "chrome/common/child_process_logging.h"
 #include "chrome/common/v8_breakpad_support_win.h"
+#include "components/crash/content/app/crashpad.h"
 #include "sandbox/win/src/sandbox.h"
 #include "ui/base/resource/resource_bundle_win.h"
 #endif
@@ -65,7 +66,7 @@
 #include "chrome/app/chrome_main_mac.h"
 #include "chrome/browser/mac/relauncher.h"
 #include "chrome/common/mac/cfbundle_blocker.h"
-#include "components/crash/content/app/crashpad_mac.h"
+#include "components/crash/content/app/crashpad.h"
 #include "components/crash/core/common/objc_zombie.h"
 #include "ui/base/l10n/l10n_util_mac.h"
 #endif
@@ -433,7 +434,6 @@ bool ChromeMainDelegate::BasicStartupComplete(int* exit_code) {
   const base::CommandLine& command_line =
       *base::CommandLine::ForCurrentProcess();
 
-
 #if defined(OS_WIN)
   // Browser should not be sandboxed.
   const bool is_browser = !command_line.HasSwitch(switches::kProcessType);
@@ -483,7 +483,9 @@ bool ChromeMainDelegate::BasicStartupComplete(int* exit_code) {
   InstallHandleHooks();
 #endif
 
+#if defined(OS_WIN) && !defined(COMPONENT_BUILD)

[Mark Mentovai, 2015/11/10 17:21:17]

Not sure what this is about.

   chrome::RegisterPathProvider();
+#endif
 #if defined(OS_CHROMEOS)
   chromeos::RegisterPathProvider();
 #endif