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

chrome/browser/crash_upload_list.cc

Index: chrome/browser/crash_upload_list.cc
diff --git a/chrome/browser/crash_upload_list.cc b/chrome/browser/crash_upload_list.cc
index 82e17d4d5cba554fce3ef1038573cbcf06e0d4da..9e30d848101d129452e5bb7f8d448613e9a777a5 100644
--- a/chrome/browser/crash_upload_list.cc
+++ b/chrome/browser/crash_upload_list.cc
@@ -11,10 +11,8 @@
 #include "chrome/common/chrome_paths.h"
 #include "content/public/browser/browser_thread.h"
 
-#if defined(OS_WIN)
-#include "chrome/browser/crash_upload_list_win.h"
-#elif defined(OS_MACOSX)
-#include "chrome/browser/crash_upload_list_mac.h"
+#if defined(OS_MACOSX) || defined(OS_WIN)
+#include "chrome/browser/crash_upload_list_crashpad.h"
 #endif
 
 scoped_refptr<CrashUploadList> CreateCrashUploadList(
@@ -23,12 +21,9 @@ scoped_refptr<CrashUploadList> CreateCrashUploadList(
   PathService::Get(chrome::DIR_CRASH_DUMPS, &crash_dir_path);
   base::FilePath upload_log_path =
       crash_dir_path.AppendASCII(CrashUploadList::kReporterLogFilename);
-#if defined(OS_WIN)
-  return new CrashUploadListWin(delegate, upload_log_path,
-                                content::BrowserThread::GetBlockingPool());
-#elif defined(OS_MACOSX)
-  return new CrashUploadListMac(delegate, upload_log_path,
-                                content::BrowserThread::GetBlockingPool());
+#if defined(OS_MACOSX) || defined(OS_WIN)
+  return new CrashUploadListCrashpad(delegate, upload_log_path,
+                                     content::BrowserThread::GetBlockingPool());
 #else
   return new CrashUploadList(delegate, upload_log_path,
                              content::BrowserThread::GetBlockingPool());