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

chrome/browser/cocoa/cocoa_test_helper.h

 // 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.
 
 #ifndef CHROME_BROWSER_COCOA_COCOA_TEST_HELPER_H_
 #define CHROME_BROWSER_COCOA_COCOA_TEST_HELPER_H_
 
 #import <Cocoa/Cocoa.h>
 #include <vector>
 
+#import "base/chrome_application_mac.h"
 #include "base/debug_util.h"
 #include "base/file_path.h"
 #include "base/mac_util.h"
 #include "base/path_service.h"
 #import "base/scoped_nsautorelease_pool.h"
 #import "base/scoped_nsobject.h"
 #include "base/scoped_ptr.h"
 #include "chrome/common/chrome_constants.h"
 #include "testing/platform_test.h"
 
@@ skipping 110 matching lines @@
 // testing::Test.
 
 // Provides the Cocoa goodness without the extraneous window.
 
 // DEPRECATED
 // TODO(dmaclach): remove as soon as I can get my other CLs in that get rid
 //                 of any dependencies on this. 10/30/09 at the latest.
 class CocoaNoWindowTestHelper {
  public:
   CocoaNoWindowTestHelper() {
-    // 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];
+    CocoaTest::BootstrapCocoa();
 
     // Set the duration of AppKit-evaluated animations (such as frame changes)
     // to zero for testing purposes. That way they take effect immediately.
     [[NSAnimationContext currentContext] setDuration:0.0];
   }
 };
 
 // DEPRECATED
 // TODO(dmaclach): remove as soon as I can get my other CLs in that get rid
-//                 of any dependencies on this. 10/30/09 at the latest.
+//                 of any dependencies on this. 11/30/09 at the latest.
 class CocoaTestHelper : public CocoaNoWindowTestHelper {
  public:
   CocoaTestHelper() {
     window_.reset([[CocoaTestHelperWindow alloc] init]);
     if (DebugUtil::BeingDebugged()) {
       [window_ orderFront:nil];
     } else {
       [window_ orderBack:nil];
     }
   }
@@ skipping 13 matching lines @@
   void clearFirstResponder() {
     [window_ setPretendIsKeyWindow:NO];
     [window_ makeFirstResponder:nil];
   }
 
  private:
   scoped_nsobject<CocoaTestHelperWindow> window_;
 };
 
 #endif  // CHROME_BROWSER_COCOA_COCOA_TEST_HELPER_H_