summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--chrome/browser/extensions/extension_proxy_apitest.cc3
-rw-r--r--chrome/browser/prerender/prerender_browsertest.cc4
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;