Mac: fix crash inspector & reporter app's location

rogerwang · rogerwang · commit 314cdecd516b · 2013-10-06T00:50:45.000+08:00
diff --git a/src/breakpad_mac.mm b/src/breakpad_mac.mm
@@ -26,6 +26,7 @@
 #include "chrome/common/child_process_logging.h"
 #include "content/public/common/content_switches.h"
 #include "components/breakpad/breakpad_client.h"
+#include "content/nw/src/paths_mac.h"
 //#include "policy/policy_constants.h"
 
 namespace {
@@ -182,19 +183,19 @@ void InitCrashReporter() {
   }
 
   // Tell Breakpad where crash_inspector and crash_report_sender are.
-  NSString* resource_path = [main_bundle resourcePath];
+  NSString* resource_path = [[NSString alloc] initWithUTF8String:GetFrameworksPath().value().c_str()];
   NSString *inspector_location =
       [resource_path stringByAppendingPathComponent:@"crash_inspector"];
   NSString *reporter_bundle_location =
       [resource_path stringByAppendingPathComponent:@"crash_report_sender.app"];
   NSString *reporter_location =
       [[NSBundle bundleWithPath:reporter_bundle_location] executablePath];
+ 
 
   VLOG(1) << "resource_path: " << [resource_path UTF8String];
   VLOG(1) << "inspector_location: " << [inspector_location UTF8String];
-  VLOG(1) << "reporter_location: " << [reporter_location UTF8String];
 
-  if (!inspector_location || !reporter_location) {
+  if (!inspector_location) {
     VLOG_IF(1, is_browser && base::mac::AmIBundled()) << "Breakpad disabled";
     return;
   }
diff --git a/src/paths_mac.h b/src/paths_mac.h
@@ -16,4 +16,6 @@ void OverrideChildProcessPath();
 // Gets the path to the content shell's pak file.
 base::FilePath GetResourcesPakFilePath();
 
+base::FilePath GetFrameworksPath();
+
 #endif  // CONTENT_SHELL_PATHS_MAC_H_
diff --git a/src/paths_mac.mm b/src/paths_mac.mm
@@ -27,8 +27,6 @@
 
 using base::FilePath;
 
-namespace {
-
 FilePath GetFrameworksPath() {
   // Start out with the path to the running executable.
   FilePath path;
@@ -50,8 +48,6 @@ FilePath GetFrameworksPath() {
   return path.Append("Frameworks");
 }
 
-}  // namespace
-
 void OverrideFrameworkBundlePath() {
   FilePath helper_path =
       GetFrameworksPath().Append("node-webkit Framework.framework");
