Fix a possible flaky ServiceWorkerNavigationPreloadTest.

content/browser/service_worker/service_worker_browsertest.cc

Index: content/browser/service_worker/service_worker_browsertest.cc
diff --git a/content/browser/service_worker/service_worker_browsertest.cc b/content/browser/service_worker/service_worker_browsertest.cc
index 560e3b51d2b45b593306fbf4fcd283cd1f832b6c..f6043806ced0f6df2d34a59cb16e6cabb736320d 100644
--- a/content/browser/service_worker/service_worker_browsertest.cc
+++ b/content/browser/service_worker/service_worker_browsertest.cc
@@ -1633,12 +1633,22 @@ IN_PROC_BROWSER_TEST_P(ServiceWorkerNavigationPreloadTest, NetworkFallback) {
   EXPECT_EQ(title, title_watcher.WaitAndGetTitle());
   EXPECT_EQ("Hello world.", GetTextContent());
 
-  // The page request must be sent twice. Once for navigation preload, and once
-  // for fallback since respondWith wasn't used.
-  ASSERT_EQ(2, GetRequestCount(kPageUrl));
-  ASSERT_TRUE(HasNavigationPreloadHeader(request_log_[kPageUrl][0]));
-  EXPECT_EQ("true", GetNavigationPreloadHeader(request_log_[kPageUrl][0]));
-  EXPECT_FALSE(HasNavigationPreloadHeader(request_log_[kPageUrl][1]));
+  // The page request must be sent once or twice:
+  // - A navigation preload reqeust may be sent. But it is possible that the

[falken, 2016/11/09 05:32:33]

request

[horo, 2016/11/09 05:37:24]

Done.

+  //   navigation preload request is canceled before reaching the server.
+  // - A fallback request must be sent since respondWith wasn't used.
+  const int request_count = GetRequestCount(kPageUrl);
+  ASSERT_TRUE(request_count == 1 || request_count == 2);
+  if (request_count == 1) {
+    // Fallback request.
+    EXPECT_FALSE(HasNavigationPreloadHeader(request_log_[kPageUrl][0]));
+  } else if (request_count == 2) {
+    // Navigation preload request.
+    ASSERT_TRUE(HasNavigationPreloadHeader(request_log_[kPageUrl][0]));
+    EXPECT_EQ("true", GetNavigationPreloadHeader(request_log_[kPageUrl][0]));
+    // Fallback request.
+    EXPECT_FALSE(HasNavigationPreloadHeader(request_log_[kPageUrl][1]));
+  }
 }
 
 IN_PROC_BROWSER_TEST_P(ServiceWorkerNavigationPreloadTest, SetHeaderValue) {