summaryrefslogtreecommitdiffstats
path: root/chrome/browser
diff options
context:
space:
mode:
authorshess@chromium.org <shess@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-08-24 18:59:54 +0000
committershess@chromium.org <shess@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-08-24 18:59:54 +0000
commit40943691e3ca7ccff9dc14ff6fbb71adaa25ac23 (patch)
treea95b0aef8ebbd4e6b31c32cdc912203072df24f7 /chrome/browser
parent60daea336a68b8cf8cbd47114a1a29486a793a62 (diff)
downloadchromium_src-40943691e3ca7ccff9dc14ff6fbb71adaa25ac23.zip
chromium_src-40943691e3ca7ccff9dc14ff6fbb71adaa25ac23.tar.gz
chromium_src-40943691e3ca7ccff9dc14ff6fbb71adaa25ac23.tar.bz2
[Mac] Always clear fake first responder for test windows.
OSX Lion changes when things are autoreleased WRT windows and field editors. BUG=93927 TEST=unit_tests --gtest_filter=Autocomplete\*:Instant\* doesn't crash. Review URL: http://codereview.chromium.org/7715015 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@98085 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser')
-rw-r--r--chrome/browser/ui/cocoa/cocoa_test_helper.mm1
-rw-r--r--chrome/browser/ui/cocoa/location_bar/autocomplete_text_field_unittest.mm1
2 files changed, 1 insertions, 1 deletions
diff --git a/chrome/browser/ui/cocoa/cocoa_test_helper.mm b/chrome/browser/ui/cocoa/cocoa_test_helper.mm
index 88e981c..a97d3f7 100644
--- a/chrome/browser/ui/cocoa/cocoa_test_helper.mm
+++ b/chrome/browser/ui/cocoa/cocoa_test_helper.mm
@@ -85,6 +85,7 @@ void CocoaTest::BootstrapCocoa() {
void CocoaTest::TearDown() {
called_tear_down_ = true;
// Call close on our test_window to clean it up if one was opened.
+ [test_window_ clearPretendKeyWindowAndFirstResponder];
[test_window_ close];
test_window_ = nil;
diff --git a/chrome/browser/ui/cocoa/location_bar/autocomplete_text_field_unittest.mm b/chrome/browser/ui/cocoa/location_bar/autocomplete_text_field_unittest.mm
index 62905bd..a959121 100644
--- a/chrome/browser/ui/cocoa/location_bar/autocomplete_text_field_unittest.mm
+++ b/chrome/browser/ui/cocoa/location_bar/autocomplete_text_field_unittest.mm
@@ -209,7 +209,6 @@ TEST_F(AutocompleteTextFieldTest, Display) {
// Test focussed drawing.
[test_window() makePretendKeyWindowAndSetFirstResponder:field_];
[field_ display];
- [test_window() clearPretendKeyWindowAndFirstResponder];
}
TEST_F(AutocompleteTextFieldObserverTest, FlagsChanged) {