summaryrefslogtreecommitdiff
path: root/chromium/content/browser/appcache/appcache_browsertest.cc
diff options
context:
space:
mode:
Diffstat (limited to 'chromium/content/browser/appcache/appcache_browsertest.cc')
-rw-r--r--chromium/content/browser/appcache/appcache_browsertest.cc6
1 files changed, 4 insertions, 2 deletions
diff --git a/chromium/content/browser/appcache/appcache_browsertest.cc b/chromium/content/browser/appcache/appcache_browsertest.cc
index c20d15e6fef..5c96deb7e85 100644
--- a/chromium/content/browser/appcache/appcache_browsertest.cc
+++ b/chromium/content/browser/appcache/appcache_browsertest.cc
@@ -98,8 +98,9 @@ IN_PROC_BROWSER_TEST_F(
}
// Regression test for crbug.com/937761.
+// Disabled due to flakiness https://crbug.com/1031090.
IN_PROC_BROWSER_TEST_F(AppCacheNetworkServiceBrowserTest,
- SSLCertificateCachedCorrectly) {
+ DISABLED_SSLCertificateCachedCorrectly) {
net::EmbeddedTestServer embedded_test_server(
net::EmbeddedTestServer::TYPE_HTTPS);
embedded_test_server.SetSSLConfig(net::EmbeddedTestServer::CERT_OK,
@@ -273,8 +274,9 @@ class LoaderFactoryInterceptingBrowserClient : public TestContentBrowserClient {
std::vector<std::unique_ptr<PassThroughURLLoaderFactory>> proxies_;
};
+// Timeout waiting for "AppCache updated" title (http://crbug.com/1080708).
IN_PROC_BROWSER_TEST_F(AppCacheNetworkServiceBrowserTest,
- AppCacheRequestsAreProxied) {
+ DISABLED_AppCacheRequestsAreProxied) {
LoaderFactoryInterceptingBrowserClient browser_client;
ContentBrowserClient* original_client =
SetBrowserClientForTesting(&browser_client);