Upstream version 10.39.225.0

[platform/framework/web/crosswalk.git] / src / chrome / test / base / chrome_test_launcher.cc

diff --git a/src/chrome/test/base/chrome_test_launcher.cc b/src/chrome/test/base/chrome_test_launcher.cc
index 37e1141..524be28 100644 (file)
--- a/src/chrome/test/base/chrome_test_launcher.cc
+++ b/src/chrome/test/base/chrome_test_launcher.cc
@@ -6,8 +6,8 @@
 
 #include "base/command_line.h"
 #include "base/debug/leak_annotations.h"
-#include "base/file_util.h"
 #include "base/files/file_path.h"
+#include "base/files/file_util.h"
 #include "base/logging.h"
 #include "base/memory/linked_ptr.h"
 #include "base/process/process_metrics.h"
@@ -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);