summaryrefslogtreecommitdiffstats
path: root/base/mac_util_unittest.mm
diff options
context:
space:
mode:
authorphajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-02-09 08:14:38 +0000
committerphajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-02-09 08:14:38 +0000
commita4378256e3c3530bd84f8cce49d1edb82874632b (patch)
tree47266268730220458ec5996a4a5994abce798dd7 /base/mac_util_unittest.mm
parent3747791d3d47eeaa9aef440bda06b50f594bd386 (diff)
downloadchromium_src-a4378256e3c3530bd84f8cce49d1edb82874632b.zip
chromium_src-a4378256e3c3530bd84f8cce49d1edb82874632b.tar.gz
chromium_src-a4378256e3c3530bd84f8cce49d1edb82874632b.tar.bz2
Remove DirectoryWatcher and the only thing using it.
DirectoryWatcher was problematic. We couldn't get it right on Linux, it can hit the disk on UI thread on Windows (Really Bad, tm). And finally, the UserScriptMaster didn't work right with it. TEST=Covered by unit_tests and browser_tests BUG=8968, 6051, 6080, 20832 Review URL: http://codereview.chromium.org/586010 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@38456 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/mac_util_unittest.mm')
-rw-r--r--base/mac_util_unittest.mm3
1 files changed, 2 insertions, 1 deletions
diff --git a/base/mac_util_unittest.mm b/base/mac_util_unittest.mm
index 801922a..b77472b 100644
--- a/base/mac_util_unittest.mm
+++ b/base/mac_util_unittest.mm
@@ -7,6 +7,7 @@
#include "base/mac_util.h"
+#import "base/chrome_application_mac.h"
#include "base/file_path.h"
#include "base/file_util.h"
#include "base/scoped_cftyperef.h"
@@ -53,7 +54,7 @@ TEST_F(MacUtilTest, TestLibraryPath) {
TEST_F(MacUtilTest, TestGrabWindowSnapshot) {
// Launch a test window so we can take a snapshot.
- [NSApplication sharedApplication];
+ [CrApplication sharedApplication];
NSRect frame = NSMakeRect(0, 0, 400, 400);
scoped_nsobject<NSWindow> window(
[[NSWindow alloc] initWithContentRect:frame