summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorshess@chromium.org <shess@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-03-02 20:27:56 +0000
committershess@chromium.org <shess@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-03-02 20:27:56 +0000
commit5811d97aae3f64e740b0163d02486d2154a9c472 (patch)
tree8850fbb236809c3a74a685439091a95ef88fd192
parent464791bb58b303419962b589a3609ed784ed1a0e (diff)
downloadchromium_src-5811d97aae3f64e740b0163d02486d2154a9c472.zip
chromium_src-5811d97aae3f64e740b0163d02486d2154a9c472.tar.gz
chromium_src-5811d97aae3f64e740b0163d02486d2154a9c472.tar.bz2
[Mac] Re-enable BrowserWindowFullScreenControllerTest.*.
r40185 (bug 36677) changed cocoa_test_helper.mm to allow more scalable timeouts for valgrind. BUG=36736 TEST=valgrind bots keep trucking. Review URL: http://codereview.chromium.org/660389 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@40415 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/browser/cocoa/browser_window_controller_unittest.mm8
1 files changed, 2 insertions, 6 deletions
diff --git a/chrome/browser/cocoa/browser_window_controller_unittest.mm b/chrome/browser/cocoa/browser_window_controller_unittest.mm
index 4e63700..cd87df1 100644
--- a/chrome/browser/cocoa/browser_window_controller_unittest.mm
+++ b/chrome/browser/cocoa/browser_window_controller_unittest.mm
@@ -580,9 +580,7 @@ class BrowserWindowFullScreenControllerTest : public CocoaTest {
- (BOOL)supportsFullscreen;
@end
-// Disabled because it fails (and later crashes) the tsan bot.
-// http://crbug.com/36736
-TEST_F(BrowserWindowFullScreenControllerTest, DISABLED_TestFullscreen) {
+TEST_F(BrowserWindowFullScreenControllerTest, TestFullscreen) {
EXPECT_FALSE([controller_ isFullscreen]);
[controller_ setFullscreen:YES];
EXPECT_TRUE([controller_ isFullscreen]);
@@ -590,9 +588,7 @@ TEST_F(BrowserWindowFullScreenControllerTest, DISABLED_TestFullscreen) {
EXPECT_FALSE([controller_ isFullscreen]);
}
-// Disabled because it fails (and later crashes) the tsan bot.
-// http://crbug.com/36736
-TEST_F(BrowserWindowFullScreenControllerTest, DISABLED_TestActivate) {
+TEST_F(BrowserWindowFullScreenControllerTest, TestActivate) {
EXPECT_FALSE([controller_ isFullscreen]);
[controller_ activate];