Revert 49984 - patch from issue 2762014

chrome/browser/chrome_browser_application_mac.mm

 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #import "chrome/browser/chrome_browser_application_mac.h"
 
 #import "base/histogram.h"
 #import "base/logging.h"
 #import "base/scoped_nsobject.h"
 #import "base/sys_string_conversions.h"
@@ skipping 67 matching lines @@
 // interesting to track in aggregate (those relating to distributed
 // objects, for instance).
 const size_t kKnownNSExceptionCount = 25;
 
 const size_t kUnknownNSException = kKnownNSExceptionCount;
 
 size_t BinForException(NSException* exception) {
   // A list of common known exceptions.  The list position will
   // determine where they live in the histogram, so never move them
   // around, only add to the end.
-<<<<<<< HEAD
   static NSString* const kKnownNSExceptionNames[] = {
-=======
-  static NSString* kKnownNSExceptionNames[] = {
->>>>>>> more
     // ???
     NSGenericException,
 
     // Out-of-range on NSString or NSArray.
     NSRangeException,
 
     // Invalid arg to method, unrecognized selector.
     NSInvalidArgumentException,
 
     // malloc() returned null in object creation, I think.
@@ skipping 170 matching lines @@
       }
     }
     if (!found) {
       return NO;
     }
   }
 
   // When a Cocoa control is wired to a freed object, we get crashers
   // in the call to |super| with no useful information in the
   // backtrace.  Attempt to add some useful information.
-<<<<<<< HEAD
   static NSString* const kActionKey = @"sendaction";
-=======
-  static NSString* kActionKey = @"sendaction";
->>>>>>> more
 
   // If the action is something generic like -commandDispatch:, then
   // the tag is essential.
   NSInteger tag = 0;
   if ([sender isKindOfClass:[NSControl class]]) {
     tag = [sender tag];
     if (tag == 0 || tag == -1) {
       tag = [sender selectedTag];
     }
   } else if ([sender isKindOfClass:[NSMenuItem class]]) {
@@ skipping 21 matching lines @@
   if (!reportingException) {
     reportingException = YES;
     chrome_browser_application_mac::RecordExceptionWithUma(anException);
 
     // Store some human-readable information in breakpad keys in case
     // there is a crash.  Since breakpad does not provide infinite
     // storage, we track two exceptions.  The first exception thrown
     // is tracked because it may be the one which caused the system to
     // go off the rails.  The last exception thrown is tracked because
     // it may be the one most directly associated with the crash.
-<<<<<<< HEAD
     static NSString* const kFirstExceptionKey = @"firstexception";
     static BOOL trackedFirstException = NO;
     static NSString* const kLastExceptionKey = @"lastexception";
-=======
-    static NSString* kFirstExceptionKey = @"firstexception";
-    static BOOL trackedFirstException = NO;
-    static NSString* kLastExceptionKey = @"lastexception";
->>>>>>> more
 
     // TODO(shess): It would be useful to post some stacktrace info
     // from the exception.
     // 10.6 has -[NSException callStackSymbols]
     // 10.5 has -[NSException callStackReturnAddresses]
     // 10.5 has backtrace_symbols().
     // I've tried to combine the latter two, but got nothing useful.
     // The addresses are right, though, maybe we could train the crash
     // server to decode them for us.
 
     NSString* value = [NSString stringWithFormat:@"%@ reason %@",
                                 [anException name], [anException reason]];
     if (!trackedFirstException) {
       SetCrashKeyValue(kFirstExceptionKey, value);
       trackedFirstException = YES;
     } else {
       SetCrashKeyValue(kLastExceptionKey, value);
     }
 
     reportingException = NO;
   }
 
   [super reportException:anException];
 }
 
 @end