Cleans up our autorelease handling so that we don't create a layered ...

chrome/browser/cocoa/cocoa_test_helper.mm

 // Copyright (c) 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.
 
 #import "chrome/browser/cocoa/cocoa_test_helper.h"
+#import "chrome/browser/chrome_browser_application_mac.h"
 #import "base/logging.h"
 
 @implementation CocoaTestHelperWindow
 
 - (id)initWithContentRect:(NSRect)contentRect {
   return [self initWithContentRect:contentRect
                          styleMask:NSBorderlessWindowMask
                            backing:NSBackingStoreBuffered
                              defer:NO];
 }
@@ skipping 45 matching lines @@
 }
 
 void CocoaTest::BootstrapCocoa() {
   // Look in the framework bundle for resources.
   FilePath path;
   PathService::Get(base::DIR_EXE, &path);
   path = path.Append(chrome::kFrameworkName);
   mac_util::SetOverrideAppBundlePath(path);
 
   // Bootstrap Cocoa. It's very unhappy without this.
-  [NSApplication sharedApplication];
+  [CrApplication sharedApplication];
 }
 
 void CocoaTest::TearDown() {
   called_tear_down_ = true;
   // Call close on our test_window to clean it up if one was opened.
   [test_window_ close];
   test_window_ = nil;
 
   // Recycle the pool to clean up any stuff that was put on the
   // autorelease pool due to window or windowcontroller closures.
@@ skipping 65 matching lines @@
   if (!test_window_) {
     test_window_ = [[CocoaTestHelperWindow alloc] init];
     if (DebugUtil::BeingDebugged()) {
       [test_window_ orderFront:nil];
     } else {
       [test_window_ orderBack:nil];
     }
   }
   return test_window_;
 }