Remove CrApplication dependency from base

webkit/tools/test_shell/test_shell_platform_delegate_mac.mm

 // Copyright (c) 2006-2009 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.
 
 #include "build/build_config.h"
 
 // #include <Carbon/Carbon.h>
 // #include <ApplicationServices/ApplicationServices.h>
 #import <Cocoa/Cocoa.h>
 #import <objc/objc-runtime.h>
 #include <mach/task.h>
 
-#include "base/chrome_application_mac.h"
 #include "base/command_line.h"
 #include "base/logging.h"
+#include "base/message_pump_mac.h"
 #include "third_party/WebKit/WebKit/mac/WebCoreSupport/WebSystemInterface.h"
 #include "webkit/tools/test_shell/test_shell.h"
 #include "webkit/tools/test_shell/test_shell_platform_delegate.h"
 #include "webkit/tools/test_shell/test_shell_switches.h"
 
 static NSAutoreleasePool *gTestShellAutoreleasePool = nil;
 
+@interface CrApplication : NSApplication<CrAppProtocol> {
+ @private
+  BOOL handlingSendEvent_;
+}
+- (BOOL)isHandlingSendEvent;

[dmac, 2010/12/17 18:00:16]

Use a property to mimic what you did in chrome_application_mac? Or get rid of
the property there?

[Nico, 2010/12/18 01:14:28]

Done.

+@end
+
+@implementation CrApplication
+- (BOOL)isHandlingSendEvent {
+  return handlingSendEvent_;
+}
+
+- (void)sendEvent:(NSEvent*)event {
+  BOOL b = handlingSendEvent_;

[Mark Mentovai, 2010/12/17 17:31:38]

What does b signify?

wasHandlingSendEvent?

[Nico, 2010/12/18 01:14:28]

Done.

+  handlingSendEvent_ = YES;
+  [super sendEvent:event];
+  handlingSendEvent_ = b;
+}
+@end
+
 static void SetDefaultsToLayoutTestValues(void) {
   // So we can match the WebKit layout tests, we want to force a bunch of
   // preferences that control appearance to match.
   // (We want to do this as early as possible in application startup so
   // the settings are in before any higher layers could cache values.)
 
   NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
 
   const NSInteger kMinFontSizeCGSmoothes = 4;
   const NSInteger kNoFontSmoothing = 0;
@@ skipping 50 matching lines @@
   [defaults removeObjectForKey:@"AppleAquaColorVariant"];
   [defaults removeObjectForKey:@"AppleHighlightColor"];
   [defaults removeObjectForKey:@"AppleOtherHighlightColor"];
   [defaults removeObjectForKey:@"AppleLanguages"];
   [defaults removeObjectForKey:@"AppleScrollBarVariant"];
 }
 
 #if OBJC_API_VERSION == 2
 static void SwizzleAllMethods(Class imposter, Class original) {
   unsigned int imposterMethodCount = 0;
-  Method* imposterMethods = class_copyMethodList(imposter, &imposterMethodCount);
+  Method* imposterMethods =
+      class_copyMethodList(imposter, &imposterMethodCount);
 
   unsigned int originalMethodCount = 0;
-  Method* originalMethods = class_copyMethodList(original, &originalMethodCount);
+  Method* originalMethods =
+      class_copyMethodList(original, &originalMethodCount);
 
   for (unsigned int i = 0; i < imposterMethodCount; i++) {
     SEL imposterMethodName = method_getName(imposterMethods[i]);
 
     // Attempt to add the method to the original class.  If it fails, the method
     // already exists and we should instead exchange the implementations.
     if (class_addMethod(original,
                         imposterMethodName,
                         method_getImplementation(originalMethods[i]),
                         method_getTypeEncoding(originalMethods[i]))) {
@@ skipping 85 matching lines @@
 
   // If we die during tests, we don't want to be spamming the user's crash
   // reporter. Set our exception port to null and add signal handlers.
   // Both of these are necessary to avoid the crash reporter. Although, we do
   // still seem to be missing some cases.
   if (!parsed_command_line.HasSwitch(test_shell::kGDB)) {
     task_set_exception_ports(mach_task_self(), EXC_MASK_ALL, MACH_PORT_NULL,
                              EXCEPTION_DEFAULT, THREAD_STATE_NONE);
   }
 }