| Index: chrome/app/client_util.cc
|
| diff --git a/chrome/app/client_util.cc b/chrome/app/client_util.cc
|
| index 16d845e622c66d5fabc75d16c6397dd71a8bf0f2..d68229cf1f95e260206672d109c5ac1a788e402a 100644
|
| --- a/chrome/app/client_util.cc
|
| +++ b/chrome/app/client_util.cc
|
| @@ -21,7 +21,7 @@
|
| #include "base/strings/utf_string_conversions.h"
|
| #include "base/version.h"
|
| #include "base/win/windows_version.h"
|
| -#include "chrome/app/chrome_breakpad_client.h"
|
| +#include "chrome/app/chrome_crash_reporter_client.h"
|
| #include "chrome/app/client_util.h"
|
| #include "chrome/app/image_pre_reader_win.h"
|
| #include "chrome/common/chrome_constants.h"
|
| @@ -32,8 +32,8 @@
|
| #include "chrome/installer/util/google_update_settings.h"
|
| #include "chrome/installer/util/install_util.h"
|
| #include "chrome/installer/util/util_constants.h"
|
| -#include "components/crash/app/breakpad_client.h"
|
| #include "components/crash/app/breakpad_win.h"
|
| +#include "components/crash/app/crash_reporter_client.h"
|
| #include "components/metrics/client_info.h"
|
| #include "content/public/app/startup_helper_win.h"
|
| #include "sandbox/win/src/sandbox.h"
|
| @@ -44,8 +44,8 @@ typedef int (*DLL_MAIN)(HINSTANCE, sandbox::SandboxInterfaceInfo*);
|
|
|
| typedef void (*RelaunchChromeBrowserWithNewCommandLineIfNeededFunc)();
|
|
|
| -base::LazyInstance<chrome::ChromeBreakpadClient>::Leaky
|
| - g_chrome_breakpad_client = LAZY_INSTANCE_INITIALIZER;
|
| +base::LazyInstance<chrome::ChromeCrashReporterClient>::Leaky
|
| + g_chrome_crash_client = LAZY_INSTANCE_INITIALIZER;
|
|
|
| // Returns true if the build date for this module precedes the expiry date
|
| // for the pre-read experiment.
|
| @@ -290,7 +290,7 @@ int MainDllLoader::Launch(HINSTANCE instance) {
|
| sandbox::SandboxInterfaceInfo sandbox_info = {0};
|
| content::InitializeSandboxInfo(&sandbox_info);
|
|
|
| - breakpad::SetBreakpadClient(g_chrome_breakpad_client.Pointer());
|
| + crash_reporter::SetCrashReporterClient(g_chrome_crash_client.Pointer());
|
| bool exit_now = true;
|
| if (process_type_.empty()) {
|
| if (breakpad::ShowRestartDialogIfCrashed(&exit_now)) {
|
|
|