| Index: chrome_frame/test/test_with_web_server.cc
|
| diff --git a/chrome_frame/test/test_with_web_server.cc b/chrome_frame/test/test_with_web_server.cc
|
| index b43b4d79a7baea48a4e35785cfdcb8e5a263a3c7..277675aee2defc60dfdec1f8a49ceb7b88debf05 100644
|
| --- a/chrome_frame/test/test_with_web_server.cc
|
| +++ b/chrome_frame/test/test_with_web_server.cc
|
| @@ -464,7 +464,8 @@ const wchar_t kNavigateURLRelativePage[] =
|
| L"navigateurl_relative_host.html";
|
|
|
| // Flaky, crbug.com/160497.
|
| -TEST_F(ChromeFrameTestWithWebServer, FLAKY_WidgetModeIE_NavigateURLRelative) {
|
| +TEST_F(ChromeFrameTestWithWebServer,
|
| + DISABLED_WidgetModeIE_NavigateURLRelative) {
|
| SimpleBrowserTest(IE, kNavigateURLRelativePage);
|
| }
|
|
|
| @@ -478,7 +479,7 @@ const wchar_t kiframeBasicPage[] = L"iframe_basic_host.html";
|
|
|
|
|
| // Flaky, crbug.com/160497.
|
| -TEST_F(ChromeFrameTestWithWebServer, FLAKY_WidgetModeIE_iframeBasic) {
|
| +TEST_F(ChromeFrameTestWithWebServer, DISABLED_WidgetModeIE_iframeBasic) {
|
| SimpleBrowserTest(IE, kiframeBasicPage);
|
| }
|
|
|
| @@ -515,7 +516,7 @@ TEST_F(ChromeFrameTestWithWebServer, WidgetModeIE_CFInstanceFallback) {
|
| const wchar_t kCFINoSrcPage[] = L"CFInstance_no_src_host.html";
|
|
|
| // Flaky, crbug.com/160497.
|
| -TEST_F(ChromeFrameTestWithWebServer, FLAKY_WidgetModeIE_CFInstanceNoSrc) {
|
| +TEST_F(ChromeFrameTestWithWebServer, DISABLED_WidgetModeIE_CFInstanceNoSrc) {
|
| SimpleBrowserTest(IE, kCFINoSrcPage);
|
| }
|
|
|
| @@ -647,7 +648,7 @@ TEST_F(ChromeFrameTestWithWebServer, FullTabModeIE_CFHttpHeaderFrameSet) {
|
| const wchar_t kVersionPage[] = L"version.html";
|
|
|
| // Flaky, crbug.com/160497.
|
| -TEST_F(ChromeFrameTestWithWebServer, FLAKY_WidgetModeIE_Version) {
|
| +TEST_F(ChromeFrameTestWithWebServer, DISABLED_WidgetModeIE_Version) {
|
| VersionTest(IE, kVersionPage);
|
| }
|
|
|
| @@ -665,7 +666,7 @@ TEST_F(ChromeFrameTestWithWebServer, WidgetModeIE_PrivilegedApis) {
|
|
|
| const wchar_t kMetaTagPage[] = L"meta_tag.html";
|
| // Flaky, crbug.com/160497.
|
| -TEST_F(ChromeFrameTestWithWebServer, FLAKY_FullTabModeIE_MetaTag) {
|
| +TEST_F(ChromeFrameTestWithWebServer, DISABLED_FullTabModeIE_MetaTag) {
|
| SimpleBrowserTest(IE, kMetaTagPage);
|
| }
|
|
|
| @@ -710,7 +711,7 @@ const wchar_t kXMLHttpRequestTestUrl[] =
|
| L"xmlhttprequest_test.html";
|
|
|
| // Flaky, crbug.com/160497.
|
| -TEST_F(ChromeFrameTestWithWebServer, FLAKY_FullTabModeIE_XHRTest) {
|
| +TEST_F(ChromeFrameTestWithWebServer, DISABLED_FullTabModeIE_XHRTest) {
|
| SimpleBrowserTest(IE, kXMLHttpRequestTestUrl);
|
| }
|
|
|
| @@ -750,7 +751,7 @@ const wchar_t kXHRHeaderTestUrl[] =
|
| L"xmlhttprequest_header_test.html";
|
|
|
| // Marking as flaky since it occasionally times out. crbug.com/127395.
|
| -TEST_F(ChromeFrameTestWithWebServer, FLAKY_FullTabModeIE_XHRHeaderTest) {
|
| +TEST_F(ChromeFrameTestWithWebServer, DISABLED_FullTabModeIE_XHRHeaderTest) {
|
| SimpleBrowserTest(IE, kXHRHeaderTestUrl);
|
| }
|
|
|
| @@ -771,7 +772,7 @@ TEST_F(ChromeFrameTestWithWebServer, FullTabModeIE_AnchorUrlNavigateTest) {
|
| // Test whether POST-ing a form from an mshtml page to a CF page will cause
|
| // the request to get reissued. It should not.
|
| // https://code.google.com/p/chromium/issues/detail?id=143699
|
| -TEST_F(ChromeFrameTestWithWebServer, FLAKY_FullTabModeIE_TestPostReissue) {
|
| +TEST_F(ChromeFrameTestWithWebServer, DISABLED_FullTabModeIE_TestPostReissue) {
|
| // The order of pages in this array is assumed to be mshtml, cf, script.
|
| const wchar_t* kPages[] = {
|
| L"full_tab_post_mshtml.html",
|
| @@ -803,7 +804,7 @@ TEST_F(ChromeFrameTestWithWebServer, FLAKY_FullTabModeIE_TestPostReissue) {
|
| // Test whether following a link from an mshtml page to a CF page will cause
|
| // multiple network requests. It should not.
|
| // Flaky, crbug.com/160497.
|
| -TEST_F(ChromeFrameTestWithWebServer, FLAKY_FullTabModeIE_TestMultipleGet) {
|
| +TEST_F(ChromeFrameTestWithWebServer, DISABLED_FullTabModeIE_TestMultipleGet) {
|
| // The order of pages in this array is assumed to be mshtml, cf, script.
|
| const wchar_t* kPages[] = {
|
| L"full_tab_get_mshtml.html",
|
|
|