Merge trunk r97497 and its many dependents to the 14.0.835 branch.

chrome/browser/chrome_browser_application_mac.mm

 // Copyright (c) 2011 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/logging.h"
-#import "base/mac/mac_util.h"
 #import "base/mac/scoped_nsexception_enabler.h"
 #import "base/metrics/histogram.h"
 #import "base/memory/scoped_nsobject.h"
 #import "base/sys_string_conversions.h"
 #import "chrome/app/breakpad_mac.h"
 #import "chrome/browser/app_controller_mac.h"
 #include "chrome/browser/ui/browser_list.h"
 #import "chrome/browser/ui/cocoa/objc_method_swizzle.h"
 #import "chrome/browser/ui/cocoa/objc_zombie.h"
 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
@@ skipping 96 matching lines @@
                   << base::SysNSStringToUTF8(value);
       DCHECK(allow);
     }
   }
 
   // Forward to the original version.
   return gOriginalInitIMP(self, _cmd, aName, aReason, someUserInfo);
 }
 @end
 
-static IMP gOriginalNSBundleLoadIMP = NULL;
-
-@interface NSBundle (CrNSBundleSwizzle)
-- (BOOL)crLoad;
-@end
-
-@implementation NSBundle (CrNSBundleSwizzle)
-- (BOOL)crLoad {
-  // Method only called when swizzled.
-  DCHECK(_cmd == @selector(load));
-
-  // MultiClutchInputManager is broken in Chrome on Lion.
-  // http://crbug.com/90075.
-  if (base::mac::IsOSLionOrLater() &&
-      [[self bundleIdentifier]
-       isEqualToString:@"net.wonderboots.multiclutchinputmanager"]) {
-    return NO;
-  }
-
-  return gOriginalNSBundleLoadIMP(self, _cmd) != nil;
-}
-@end
-
 namespace chrome_browser_application_mac {
 
 // Maximum number of known named exceptions we'll support.  There is
 // no central registration, but I only find about 75 possibilities in
 // the system frameworks, and many of them are probably not
 // interesting to track in aggregate (those relating to distributed
 // objects, for instance).
 const size_t kKnownNSExceptionCount = 25;
 
 const size_t kUnknownNSException = kKnownNSExceptionCount;
@@ skipping 60 matching lines @@
 namespace {
 
 void SwizzleInit() {
   // Do-nothing wrapper so that we can arrange to only swizzle
   // -[NSException raise] when DCHECK() is turned on (as opposed to
   // replicating the preprocess logic which turns DCHECK() on).
   gOriginalInitIMP = ObjcEvilDoers::SwizzleImplementedInstanceMethods(
       [NSException class],
       @selector(initWithName:reason:userInfo:),
       @selector(crInitWithName:reason:userInfo:));
-
-  // Avoid loading broken input managers.
-  gOriginalNSBundleLoadIMP =
-      ObjcEvilDoers::SwizzleImplementedInstanceMethods(
-          [NSBundle class],
-          @selector(load),
-          @selector(crLoad));
 }
 
 }  // namespace
 
 @implementation BrowserCrApplication
 
 + (void)initialize {
   // Turn all deallocated Objective-C objects into zombies, keeping
   // the most recent 10,000 of them on the treadmill.
   ObjcEvilDoers::ZombieEnable(YES, 10000);
@@ skipping 215 matching lines @@
         if (RenderViewHost* rvh = contents->render_view_host()) {
           rvh->EnableRendererAccessibility();
         }
       }
     }
   }
   return [super accessibilitySetValue:value forAttribute:attribute];
 }
 
 @end