summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--chrome/browser/cocoa/bookmark_bubble_controller_unittest.mm2
-rw-r--r--chrome/browser/cocoa/cocoa_test_helper.mm2
2 files changed, 3 insertions, 1 deletions
diff --git a/chrome/browser/cocoa/bookmark_bubble_controller_unittest.mm b/chrome/browser/cocoa/bookmark_bubble_controller_unittest.mm
index 10fcd95..530d2034 100644
--- a/chrome/browser/cocoa/bookmark_bubble_controller_unittest.mm
+++ b/chrome/browser/cocoa/bookmark_bubble_controller_unittest.mm
@@ -26,6 +26,8 @@ class BookmarkBubbleControllerTest : public CocoaTest {
}
virtual void TearDown() {
+ // TODO(shess): Figure out why CocoaTest::TearDown() needs 3
+ // passes through the event loop to fully close out these windows.
[controller_ close];
controller_ = nil;
CocoaTest::TearDown();
diff --git a/chrome/browser/cocoa/cocoa_test_helper.mm b/chrome/browser/cocoa/cocoa_test_helper.mm
index 92bee83..5f9bf45 100644
--- a/chrome/browser/cocoa/cocoa_test_helper.mm
+++ b/chrome/browser/cocoa/cocoa_test_helper.mm
@@ -104,7 +104,7 @@ void CocoaTest::TearDown() {
// Cover chains of delayed actions by spinning the loop at least
// this many times.
- const int kCloseSpins = 2;
+ const int kCloseSpins = 3;
// Track the set of remaining windows so that everything can be
// reset if progress is made.