Enable Breakpad for crashes in trusted code in Native Client on Chrome for Li...

chrome/nacl/nacl_main.cc

 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "build/build_config.h"
 
 #if defined(OS_WIN)
 #include <windows.h>
 #endif
 
@@ skipping 11 matching lines @@
 #include "chrome/common/sandbox_policy.h"
 #include "chrome/nacl/nacl_main_platform_delegate.h"
 #include "chrome/nacl/nacl_thread.h"
 
 #if defined(OS_WIN)
 #include "chrome/nacl/broker_thread.h"
 #include "chrome/test/injection_test_dll.h"
 #include "sandbox/src/sandbox.h"
 #endif
 
+#if defined(USE_LINUX_BREAKPAD)
+#include "chrome/app/breakpad_linux.h"
+#endif
+
 #ifdef _WIN64
 
 // main() routine for the NaCl broker process.
 // This is necessary for supporting NaCl in Chrome on Win64.
 int NaClBrokerMain(const MainFunctionParams& parameters) {
   // The main thread of the broker.
   MessageLoopForIO main_message_loop;
   base::PlatformThread::SetName("CrNaClBrokerMain");
 
   SystemMonitor system_monitor;
@@ skipping 41 matching lines @@
 // This function provides some ways to test crash and assertion handling
 // behavior of the renderer.
 static void HandleNaClTestParameters(const CommandLine& command_line) {
   if (command_line.HasSwitch(switches::kNaClStartupDialog)) {
     ChildProcess::WaitForDebugger(L"NativeClient");
   }
 }
 
 // main() routine for the NaCl loader process.
 int NaClMain(const MainFunctionParams& parameters) {
+#if defined(USE_LINUX_BREAKPAD)
+  // Needs to be called after we have chrome::DIR_USER_DATA.
+  InitCrashReporter();
+#endif
   const CommandLine& parsed_command_line = parameters.command_line_;
 
   // This function allows pausing execution using the --nacl-startup-dialog
   // flag allowing us to attach a debugger.
   // Do not move this function down since that would mean we can't easily debug
   // whatever occurs before it.
   HandleNaClTestParameters(parsed_command_line);
 
   // The main thread of the plugin services IO.
   MessageLoopForIO main_message_loop;
@@ skipping 26 matching lines @@
     // require waiting for a timeout.
     VLOG(1) << "Sandbox test failed: Not launching NaCl process";
   }
 #else
   NOTIMPLEMENTED() << " not implemented startup, plugin startup dialog etc.";
 #endif
 
   platform.PlatformUninitialize();
   return 0;
 }