Fixing several problems with the build.

- Had to make one line file_path_utils conditional on which build
  system was building it (because GYP build and scons build use
  different versions of chrome/base).

- Missed a couple instances of "file/" in the path to nixysa.

- New version of breakpad has a different API on the Mac.
Review URL: http://codereview.chromium.org/160056

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@21470 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 3 insertions, 2 deletions

diff --git a/o3d/plugin/mac/plugin_mac.mm b/o3d/plugin/mac/plugin_mac.mm
index 5df3b88..0714ad5 100644
--- a/o3d/plugin/mac/plugin_mac.mm
+++ b/o3d/plugin/mac/plugin_mac.mm
@@ -256,7 +256,8 @@ void RenderTimer::TimerCallback(CFRunLoopTimerRef timer, void* info) {
 
 bool ExceptionCallback(int exception_type,
                        int exception_code,
-                       mach_port_t crashing_thread) {
+                       mach_port_t crashing_thread,
+                       void* context) {
   return BreakpadEnabler::IsEnabled();
 }
 
@@ -266,7 +267,7 @@ void InitializeBreakpad() {
     NSDictionary* info = [bundle infoDictionary];
 
     gBreakpadRef = BreakpadCreate(info);
-    BreakpadSetFilterCallback(gBreakpadRef, ExceptionCallback);
+    BreakpadSetFilterCallback(gBreakpadRef, ExceptionCallback, NULL);
   }
 }