Simplify how we stub breakpad. If breakpad is in, use the real file, if not, use the stubs. We already use the stubs on unittests, so this just makes the same thing apply to the app. This gets breakpad's slow steps out of the google chrome mac rolling build.

TEST=breakpad still works in official builds
BUG=none
TBR=mark@chromium.org
Review URL: http://codereview.chromium.org/149499

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

2 files changed, 1 insertions, 26 deletions

diff --git a/chrome/app/breakpad_mac.mm b/chrome/app/breakpad_mac.mm
index 0356258..3307829 100644
--- a/chrome/app/breakpad_mac.mm
+++ b/chrome/app/breakpad_mac.mm
@@ -18,31 +18,6 @@
 
 extern "C" {
 
-#if !defined(GOOGLE_CHROME_BUILD)
-
-// If we aren't compiling as a branded build, then add dummy versions of the
-// Breakpad functions so we don't have to link against Breakpad.
-
-BreakpadRef BreakpadCreate(NSDictionary *parameters) {
-  NOTREACHED();
-  return NULL;
-}
-
-void BreakpadRelease(BreakpadRef ref) {
-  NOTREACHED();
-}
-
-void BreakpadAddUploadParameter(BreakpadRef ref, NSString *key,
-                                NSString *value) {
-  NOTREACHED();
-}
-
-void BreakpadRemoveUploadParameter(BreakpadRef ref, NSString *key) {
-  NOTREACHED();
-}
-
-#endif  // !defined(GOOGLE_CHROME_BUILD)
-
 namespace {
 
 BreakpadRef gBreakpadRef = NULL;
diff --git a/chrome/app/breakpad_mac_stubs.mm b/chrome/app/breakpad_mac_stubs.mm
index ea5cfdc..258e02a 100644
--- a/chrome/app/breakpad_mac_stubs.mm
+++ b/chrome/app/breakpad_mac_stubs.mm
@@ -5,7 +5,7 @@
 #import "chrome/app/breakpad_mac.h"
 
 // Stubbed out versions of breakpad integration functions so we can compile
-// unit tests without linking in Breakpad.
+// without linking in Breakpad.
 
 bool IsCrashReporterDisabled() {
   return true;