PlzNavigate: Fix wrong "Cache-Control" header.

content/browser/loader/reload_cache_control_browsertest.cc

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <memory>
 #include <string>
 #include <vector>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
@@ skipping 139 matching lines @@
     EXPECT_EQ(kNoCacheControl, request_log_[13].cache_control);
     EXPECT_EQ(kReloadFramePath, request_log_[14].relative_url);
     EXPECT_EQ(kNoCacheControl, request_log_[14].cache_control);
     EXPECT_EQ(kReloadImagePath, request_log_[15].relative_url);
     EXPECT_EQ(kNoCacheControl, request_log_[15].cache_control);
   }
 }
 
 // Test if bypassing reload issues requests with proper cache control flags.
 IN_PROC_BROWSER_TEST_F(ReloadCacheControlBrowserTest, BypassingReload) {
-  // TODO(crbug.com/671545): This test gets to be unstable if browser-side
-  // navigation is enabled. This is because we can not ensure which of frame and
-  // image requests hits the network first.
-  if (IsBrowserSideNavigationEnabled())
-    return;
 
   GURL url(embedded_test_server()->GetURL(kReloadTestPath));
 
-  EXPECT_TRUE(NavigateToURL(shell(), url));
-  ReloadBypassingCacheBlockUntilNavigationsComplete(shell(), 1);
-
+  NavigateToURLBlockUntilNavigationsComplete(shell(), url, 1);
   {
     base::AutoLock lock(request_log_lock_);
-    ASSERT_EQ(8UL, request_log_.size());
+    ASSERT_EQ(4UL, request_log_.size());
+
     EXPECT_EQ(kReloadTestPath, request_log_[0].relative_url);
     EXPECT_EQ(kNoCacheControl, request_log_[0].cache_control);
     EXPECT_EQ(kReloadImagePath, request_log_[1].relative_url);
     EXPECT_EQ(kNoCacheControl, request_log_[1].cache_control);
     EXPECT_EQ(kReloadFramePath, request_log_[2].relative_url);
     EXPECT_EQ(kNoCacheControl, request_log_[2].cache_control);
     EXPECT_EQ(kReloadImagePath, request_log_[3].relative_url);
     EXPECT_EQ(kNoCacheControl, request_log_[3].cache_control);
+  }
+
+  ReloadBypassingCacheBlockUntilNavigationsComplete(shell(), 1);
+  {
+    base::AutoLock lock(request_log_lock_);
+    ASSERT_EQ(8UL, request_log_.size());

[arthursonzogni, 2017/05/05 16:11:52]

I broke it into two steps: initial load and reload. I was a little bit confused
the first time I look at the code. This change has nothing to do with this CL
however.

 
     // Only the top main resource should be requested with kNoCacheCacheControl.
     EXPECT_EQ(kReloadTestPath, request_log_[4].relative_url);
     EXPECT_EQ(kNoCacheCacheControl, request_log_[4].cache_control);
     EXPECT_EQ(kReloadImagePath, request_log_[5].relative_url);
     EXPECT_EQ(kNoCacheCacheControl, request_log_[5].cache_control);
     EXPECT_EQ(kReloadFramePath, request_log_[6].relative_url);
     EXPECT_EQ(kNoCacheCacheControl, request_log_[6].cache_control);
     EXPECT_EQ(kReloadImagePath, request_log_[7].relative_url);
     EXPECT_EQ(kNoCacheCacheControl, request_log_[7].cache_control);
@@ skipping 108 matching lines @@
     EXPECT_EQ(kReloadFramePath, request_log_[14].relative_url);
     EXPECT_EQ(kNoCacheControl, request_log_[14].cache_control);
     EXPECT_EQ(kReloadImagePath, request_log_[15].relative_url);
     EXPECT_EQ(kNoCacheControl, request_log_[15].cache_control);
   }
 }
 
 }  // namespace
 
 }  // namespace content