diff options
| author | rdsmith@chromium.org <rdsmith@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-11 20:26:32 +0000 |
|---|---|---|
| committer | rdsmith@chromium.org <rdsmith@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-11 20:26:32 +0000 |
| commit | c4de9fc567bd73c53ebd2c9b829d9382900f40a7 (patch) | |
| tree | 6527da872413db4021789ae2a719e008797ce1ca /chrome | |
| parent | 36429da8c40eb8f16d851b1cc3335b9bc162511a (diff) | |
| download | chromium_src-c4de9fc567bd73c53ebd2c9b829d9382900f40a7.zip chromium_src-c4de9fc567bd73c53ebd2c9b829d9382900f40a7.tar.gz chromium_src-c4de9fc567bd73c53ebd2c9b829d9382900f40a7.tar.bz2 | |
Marked various tests as flaky/disabled.
BUG=88973
BUG=88972
TEST=None.
Review URL: http://codereview.chromium.org/7337004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@92048 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/browser/extensions/extension_proxy_apitest.cc | 3 | ||||
| -rw-r--r-- | chrome/browser/prerender/prerender_browsertest.cc | 4 |
2 files changed, 5 insertions, 2 deletions
diff --git a/chrome/browser/extensions/extension_proxy_apitest.cc b/chrome/browser/extensions/extension_proxy_apitest.cc index 736f4aa..96b5494 100644 --- a/chrome/browser/extensions/extension_proxy_apitest.cc +++ b/chrome/browser/extensions/extension_proxy_apitest.cc @@ -193,8 +193,9 @@ IN_PROC_BROWSER_TEST_F(ProxySettingsApiTest, } // Tests setting values also for incognito mode +// Test disabled due to http://crbug.com/88972. IN_PROC_BROWSER_TEST_F(ProxySettingsApiTest, - ProxyFixedIndividualIncognitoAlso) { + DISABLED_ProxyFixedIndividualIncognitoAlso) { ASSERT_TRUE(RunExtensionTestIncognito("proxy/individual_incognito_also")) << message_; const Extension* extension = GetSingleLoadedExtension(); diff --git a/chrome/browser/prerender/prerender_browsertest.cc b/chrome/browser/prerender/prerender_browsertest.cc index 6c890ca..b4133f3 100644 --- a/chrome/browser/prerender/prerender_browsertest.cc +++ b/chrome/browser/prerender/prerender_browsertest.cc @@ -800,7 +800,9 @@ IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderClientRedirectToHttps) { // Checks that client-issued redirects within an iframe in a prerendered // page will not count as an "alias" for the prerendered page. -IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderClientRedirectInIframe) { +// Test flaky due to http://crbug.com/88973. +IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, + FLAKY_PrerenderClientRedirectInIframe) { std::string redirect_path = CreateClientRedirect( "/files/prerender/prerender_embedded_content.html"); std::vector<net::TestServer::StringPair> replacement_text; |