| Index: chrome/browser/cocoa/cocoa_test_helper.h
|
| ===================================================================
|
| --- chrome/browser/cocoa/cocoa_test_helper.h (revision 31104)
|
| +++ chrome/browser/cocoa/cocoa_test_helper.h (working copy)
|
| @@ -8,6 +8,7 @@
|
| #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"
|
| @@ -138,15 +139,8 @@
|
| 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);
|
| + CocoaTest::BootstrapCocoa();
|
|
|
| - // Bootstrap Cocoa. It's very unhappy without this.
|
| - [NSApplication sharedApplication];
|
| -
|
| // 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];
|
| @@ -155,7 +149,7 @@
|
|
|
| // 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() {
|
|
|