2 files changed, 19 insertions, 9 deletions
diff --git a/chrome/plugin/DEPS b/chrome/plugin/DEPS
index 0d9d3a6..08fd485 100644
--- a/chrome/plugin/DEPS
+++ b/chrome/plugin/DEPS
@@ -1,9 +1,10 @@
-include_rules = [
-  "+chrome/renderer",
-  "+sandbox/src",
-  "+skia/ext",
-  "+third_party/npapi",
-  "+webkit/glue",
-  "+webkit/glue/plugins",
-]
-
+include_rules = [
+  "+chrome/app",
+  "+chrome/renderer",
+  "+sandbox/src",
+  "+skia/ext",
+  "+third_party/npapi",
+  "+webkit/glue",
+  "+webkit/glue/plugins",
+]
+
diff --git a/chrome/plugin/plugin_main.cc b/chrome/plugin/plugin_main.cc
index b051501..0b67360 100644
--- a/chrome/plugin/plugin_main.cc
+++ b/chrome/plugin/plugin_main.cc
@@ -28,6 +28,10 @@
 #include "chrome/common/plugin_carbon_interpose_constants_mac.h"
 #endif
 
+#if defined(USE_LINUX_BREAKPAD)
+#include "chrome/app/breakpad_linux.h"
+#endif
+
 #if defined(OS_MACOSX)
 // Removes our Carbon library interposing from the environment so that it
 // doesn't carry into any processes that plugins might start.
@@ -65,6 +69,11 @@ static void TrimInterposeEnvironment() {
 
 // main() routine for running as the plugin process.
 int PluginMain(const MainFunctionParams& parameters) {
+#if defined(USE_LINUX_BREAKPAD)
+  // Needs to be called after we have chrome::DIR_USER_DATA.
+  InitCrashReporter();
+#endif
+
   // The main thread of the plugin services UI.
 #if defined(OS_MACOSX)
   // For Mac NPAPI plugins, we don't want a MessageLoop::TYPE_UI because