Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2406)

Unified Diff: chrome/browser/chrome_service_worker_browsertest.cc

Issue 2157353002: Disabling ChromeServiceWorkerFetchTest.EmbedPdf{Same,Other}Origin on Windows due to timeouts. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chrome_service_worker_browsertest.cc
diff --git a/chrome/browser/chrome_service_worker_browsertest.cc b/chrome/browser/chrome_service_worker_browsertest.cc
index 8d054fc64659d88a29cd2d5840b2fade6b70de58..8d2dd73882b5f70c0a900c36bab3f19f704f9fa9 100644
--- a/chrome/browser/chrome_service_worker_browsertest.cc
+++ b/chrome/browser/chrome_service_worker_browsertest.cc
@@ -12,6 +12,7 @@
#include "base/run_loop.h"
#include "base/strings/stringprintf.h"
#include "base/strings/utf_string_conversions.h"
+#include "build/build_config.h"
#include "chrome/browser/chrome_notification_types.h"
#include "chrome/browser/profiles/profile.h"
#include "chrome/browser/ui/browser.h"
@@ -215,7 +216,13 @@ class ChromeServiceWorkerFetchTest : public ChromeServiceWorkerTest {
DISALLOW_COPY_AND_ASSIGN(ChromeServiceWorkerFetchTest);
};
-IN_PROC_BROWSER_TEST_F(ChromeServiceWorkerFetchTest, EmbedPdfSameOrigin) {
+// Flaky on Windows; https://crbug.com/628898.
+#if defined(OS_WIN)
+#define MAYBE_EmbedPdfSameOrigin DISABLED_EmbedPdfSameOrigin
+#else
+#define MAYBE_EmbedPdfSameOrigin EmbedPdfSameOrigin
+#endif
+IN_PROC_BROWSER_TEST_F(ChromeServiceWorkerFetchTest, MAYBE_EmbedPdfSameOrigin) {
// <embed src="test.pdf">
const std::string result(ExecuteScriptAndExtractString(
"var embed = document.createElement('embed');"
@@ -224,7 +231,14 @@ IN_PROC_BROWSER_TEST_F(ChromeServiceWorkerFetchTest, EmbedPdfSameOrigin) {
EXPECT_EQ(RequestString(GetURL("/test.pdf"), "no-cors", "include"), result);
}
-IN_PROC_BROWSER_TEST_F(ChromeServiceWorkerFetchTest, EmbedPdfOtherOrigin) {
+// Flaky on Windows; https://crbug.com/628898.
+#if defined(OS_WIN)
+#define MAYBE_EmbedPdfOtherOrigin DISABLED_EmbedPdfOtherOrigin
+#else
+#define MAYBE_EmbedPdfOtherOrigin EmbedPdfOtherOrigin
+#endif
+IN_PROC_BROWSER_TEST_F(ChromeServiceWorkerFetchTest,
+ MAYBE_EmbedPdfOtherOrigin) {
// <embed src="https://www.example.com/test.pdf">
const std::string result(ExecuteScriptAndExtractString(
"var embed = document.createElement('embed');"
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698