summaryrefslogtreecommitdiffstats
path: root/chrome_frame
diff options
context:
space:
mode:
authoramit@chromium.org <amit@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-11-04 22:07:09 +0000
committeramit@chromium.org <amit@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-11-04 22:07:09 +0000
commit60a50ad4551779947cf53f80d33d3da27e51e04b (patch)
tree566551a4e4eec903c0e04e09122f6615765a1fcc /chrome_frame
parentd8fbf589947080e223c40c3dad7b2f3f7a54c66d (diff)
downloadchromium_src-60a50ad4551779947cf53f80d33d3da27e51e04b.zip
chromium_src-60a50ad4551779947cf53f80d33d3da27e51e04b.tar.gz
chromium_src-60a50ad4551779947cf53f80d33d3da27e51e04b.tar.bz2
Remove FLAKY from tests that are no longer flaky.
BUG=32321,37009,37087,30622 TEST=concerned tests Review URL: http://codereview.chromium.org/4486001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@65117 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame')
-rw-r--r--chrome_frame/test/test_with_web_server.cc16
1 files changed, 5 insertions, 11 deletions
diff --git a/chrome_frame/test/test_with_web_server.cc b/chrome_frame/test/test_with_web_server.cc
index 546ac341..05c931d 100644
--- a/chrome_frame/test/test_with_web_server.cc
+++ b/chrome_frame/test/test_with_web_server.cc
@@ -450,8 +450,7 @@ TEST_F(ChromeFrameTestWithWebServer, WidgetModeOpera_NavigateURLRelative) {
const wchar_t kNavigateSimpleObjectFocus[] = L"simple_object_focus.html";
-// http://crbug.com/37087
-TEST_F(ChromeFrameTestWithWebServer, FLAKY_WidgetModeFF_ObjectFocus) {
+TEST_F(ChromeFrameTestWithWebServer, WidgetModeFF_ObjectFocus) {
SimpleBrowserTest(FIREFOX, kNavigateSimpleObjectFocus);
}
@@ -758,8 +757,7 @@ TEST_F(ChromeFrameTestWithWebServer, FullTabModeIE_CFHttpHeaderFrameSet) {
SimpleBrowserTest(IE, kFullTabHttpHeaderPageFrameset);
}
-// Flaky on the build bots. See http://crbug.com/30622
-TEST_F(ChromeFrameTestWithWebServer, FLAKY_WidgetModeFF_InitializeHidden) {
+TEST_F(ChromeFrameTestWithWebServer, WidgetModeFF_InitializeHidden) {
SimpleBrowserTest(FIREFOX, kInitializeHiddenPage);
}
@@ -772,8 +770,7 @@ TEST_F(ChromeFrameTestWithWebServer,
const wchar_t kInHeadPage[] = L"in_head.html";
-// Flaky on build bots. See http://crbug.com/37009
-TEST_F(ChromeFrameTestWithWebServer, FLAKY_WidgetModeFF_InHead) {
+TEST_F(ChromeFrameTestWithWebServer, WidgetModeFF_InHead) {
SimpleBrowserTest(FIREFOX, kInHeadPage);
}
@@ -803,8 +800,7 @@ TEST_F(ChromeFrameTestWithWebServer, WidgetModeOpera_EventListener) {
const wchar_t kPrivilegedApisPage[] = L"privileged_apis_host.html";
-// http://crbug.com/32321
-TEST_F(ChromeFrameTestWithWebServer, FLAKY_WidgetModeIE_PrivilegedApis) {
+TEST_F(ChromeFrameTestWithWebServer, WidgetModeIE_PrivilegedApis) {
SimpleBrowserTest(IE, kPrivilegedApisPage);
}
@@ -835,10 +831,8 @@ TEST_F(ChromeFrameTestWithWebServer, FullTabModeIE_PersistentCookieTest) {
SimpleBrowserTest(IE, kPersistentCookieTest);
}
-// This test has been disabled because we need a better way to navigate out
-// of chrome frame and detect it.
const wchar_t kNavigateOutPage[] = L"navigate_out.html";
-TEST_F(ChromeFrameTestWithWebServer, DISABLED_FullTabModeIE_NavigateOut) {
+TEST_F(ChromeFrameTestWithWebServer, FullTabModeIE_NavigateOut) {
SimpleBrowserTest(IE, kNavigateOutPage);
}