| Index: components/crash/content/app/crashpad_win.cc
|
| diff --git a/components/crash/content/app/crashpad_win.cc b/components/crash/content/app/crashpad_win.cc
|
| index 6d01b281ba1d655dd5826fcd8523c2528fa67f3c..fa50b012bc755f7ce2d1fcbd1df39be759da60dc 100644
|
| --- a/components/crash/content/app/crashpad_win.cc
|
| +++ b/components/crash/content/app/crashpad_win.cc
|
| @@ -9,7 +9,6 @@
|
| #include "base/debug/crash_logging.h"
|
| #include "base/environment.h"
|
| #include "base/files/file_util.h"
|
| -#include "base/lazy_instance.h"
|
| #include "base/numerics/safe_conversions.h"
|
| #include "base/strings/string16.h"
|
| #include "base/strings/string_number_conversions.h"
|
| @@ -26,13 +25,6 @@
|
| namespace crash_reporter {
|
| namespace internal {
|
|
|
| -namespace {
|
| -
|
| -base::LazyInstance<crashpad::CrashpadClient>::Leaky g_crashpad_client =
|
| - LAZY_INSTANCE_INITIALIZER;
|
| -
|
| -} // namespace
|
| -
|
| void GetPlatformCrashpadAnnotations(
|
| std::map<std::string, std::string>* annotations) {
|
| CrashReporterClient* crash_reporter_client = GetCrashReporterClient();
|
| @@ -116,20 +108,19 @@ base::FilePath PlatformCrashpadInitialization(bool initial_client,
|
| exe_file = exe_dir.Append(FILE_PATH_LITERAL("crashpad_handler.exe"));
|
| }
|
|
|
| - g_crashpad_client.Get().StartHandler(exe_file, database_path, metrics_path,
|
| - url, process_annotations, arguments,
|
| - false, false);
|
| + GetCrashpadClient().StartHandler(exe_file, database_path, metrics_path, url,
|
| + process_annotations, arguments, false,
|
| + false);
|
|
|
| // If we're the browser, push the pipe name into the environment so child
|
| // processes can connect to it. If we inherited another crashpad_handler's
|
| // pipe name, we'll overwrite it here.
|
| env->SetVar(kPipeNameVar,
|
| - base::UTF16ToUTF8(g_crashpad_client.Get().GetHandlerIPCPipe()));
|
| + base::UTF16ToUTF8(GetCrashpadClient().GetHandlerIPCPipe()));
|
| } else {
|
| std::string pipe_name_utf8;
|
| if (env->GetVar(kPipeNameVar, &pipe_name_utf8)) {
|
| - g_crashpad_client.Get().SetHandlerIPCPipe(
|
| - base::UTF8ToUTF16(pipe_name_utf8));
|
| + GetCrashpadClient().SetHandlerIPCPipe(base::UTF8ToUTF16(pipe_name_utf8));
|
| }
|
| }
|
|
|
| @@ -218,7 +209,7 @@ extern "C" {
|
| // releases of Chrome. Please contact syzygy-team@chromium.org before doing so!
|
| int __declspec(dllexport) CrashForException(
|
| EXCEPTION_POINTERS* info) {
|
| - crash_reporter::internal::g_crashpad_client.Get().DumpAndCrash(info);
|
| + crash_reporter::GetCrashpadClient().DumpAndCrash(info);
|
| return EXCEPTION_CONTINUE_SEARCH;
|
| }
|
|
|
|
|