Try to fix broken tree

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

chrome/app/breakpad_mac.h

@@ -5,6 +5,8 @@
 #ifndef CHROME_APP_BREAKPAD_MAC_H_
 #define CHROME_APP_BREAKPAD_MAC_H_
 
+extern "C" {
+
 // This header defines the Chrome entry points for Breakpad integration.
 
 // Initializes Breakpad.
@@ -34,4 +36,6 @@ void ClearCrashKeyValue(NSString* key);
 
 #endif  // __OBJC__
 
+}
+
 #endif  // CHROME_APP_BREAKPAD_MAC_H_

chrome/app/breakpad_mac.mm

@@ -15,10 +15,10 @@
 #import "breakpad/src/client/mac/Framework/Breakpad.h"
 #include "chrome/installer/util/google_update_settings.h"
 
-#if !defined(GOOGLE_CHROME_BUILD)
-
 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.
 
@@ -40,8 +40,6 @@ void BreakpadRemoveUploadParameter(BreakpadRef ref, NSString *key) {
   NOTREACHED();
 }
 
-}
-
 #endif  // !defined(GOOGLE_CHROME_BUILD)
 
 namespace {
@@ -151,3 +149,6 @@ void ClearCrashKeyValue(NSString* key) {
 
   BreakpadRemoveUploadParameter(gBreakpadRef, key);
 }
+
+}
+