| Index: chrome/test/base/chrome_test_launcher.cc
|
| diff --git a/chrome/test/base/chrome_test_launcher.cc b/chrome/test/base/chrome_test_launcher.cc
|
| index 10979ce3f74ae33f78c77c650cf739bdcab670d1..524be28555d62019c30bdb57842e642e807b6ce8 100644
|
| --- a/chrome/test/base/chrome_test_launcher.cc
|
| +++ b/chrome/test/base/chrome_test_launcher.cc
|
| @@ -41,7 +41,7 @@
|
| #endif
|
|
|
| #if defined(OS_LINUX) || defined(OS_ANDROID)
|
| -#include "chrome/app/chrome_breakpad_client.h"
|
| +#include "chrome/app/chrome_crash_reporter_client.h"
|
| #endif
|
|
|
| namespace {
|
| @@ -114,10 +114,10 @@ int LaunchChromeTests(int default_jobs,
|
| #if defined(OS_LINUX) || defined(OS_ANDROID)
|
| // We leak this pointer intentionally. The breakpad client needs to outlive
|
| // all other code.
|
| - chrome::ChromeBreakpadClient* breakpad_client =
|
| - new chrome::ChromeBreakpadClient();
|
| - ANNOTATE_LEAKING_OBJECT_PTR(breakpad_client);
|
| - breakpad::SetBreakpadClient(breakpad_client);
|
| + chrome::ChromeCrashReporterClient* crash_client =
|
| + new chrome::ChromeCrashReporterClient();
|
| + ANNOTATE_LEAKING_OBJECT_PTR(crash_client);
|
| + crash_reporter::SetCrashReporterClient(crash_client);
|
| #endif
|
|
|
| ChromeTestLauncherDelegate launcher_delegate(runner);
|
|
|