| OLD | NEW |
| 1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include <memory> | 5 #include <memory> |
| 6 #include <string> | 6 #include <string> |
| 7 #include <vector> | 7 #include <vector> |
| 8 | 8 |
| 9 #include "base/bind.h" | 9 #include "base/bind.h" |
| 10 #include "base/bind_helpers.h" | 10 #include "base/bind_helpers.h" |
| (...skipping 139 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 150 EXPECT_EQ(kNoCacheControl, request_log_[13].cache_control); | 150 EXPECT_EQ(kNoCacheControl, request_log_[13].cache_control); |
| 151 EXPECT_EQ(kReloadFramePath, request_log_[14].relative_url); | 151 EXPECT_EQ(kReloadFramePath, request_log_[14].relative_url); |
| 152 EXPECT_EQ(kNoCacheControl, request_log_[14].cache_control); | 152 EXPECT_EQ(kNoCacheControl, request_log_[14].cache_control); |
| 153 EXPECT_EQ(kReloadImagePath, request_log_[15].relative_url); | 153 EXPECT_EQ(kReloadImagePath, request_log_[15].relative_url); |
| 154 EXPECT_EQ(kNoCacheControl, request_log_[15].cache_control); | 154 EXPECT_EQ(kNoCacheControl, request_log_[15].cache_control); |
| 155 } | 155 } |
| 156 } | 156 } |
| 157 | 157 |
| 158 // Test if bypassing reload issues requests with proper cache control flags. | 158 // Test if bypassing reload issues requests with proper cache control flags. |
| 159 IN_PROC_BROWSER_TEST_F(ReloadCacheControlBrowserTest, BypassingReload) { | 159 IN_PROC_BROWSER_TEST_F(ReloadCacheControlBrowserTest, BypassingReload) { |
| 160 // TODO(crbug.com/671545): This test gets to be unstable if browser-side |
| 161 // navigation is enabled. This is because we can not ensure which of frame and |
| 162 // image requests hits the network first. |
| 163 if (IsBrowserSideNavigationEnabled()) |
| 164 return; |
| 165 |
| 160 GURL url(embedded_test_server()->GetURL(kReloadTestPath)); | 166 GURL url(embedded_test_server()->GetURL(kReloadTestPath)); |
| 161 | 167 |
| 162 EXPECT_TRUE(NavigateToURL(shell(), url)); | 168 EXPECT_TRUE(NavigateToURL(shell(), url)); |
| 163 ReloadBypassingCacheBlockUntilNavigationsComplete(shell(), 1); | 169 ReloadBypassingCacheBlockUntilNavigationsComplete(shell(), 1); |
| 164 | 170 |
| 165 { | 171 { |
| 166 base::AutoLock lock(request_log_lock_); | 172 base::AutoLock lock(request_log_lock_); |
| 167 ASSERT_EQ(8UL, request_log_.size()); | 173 ASSERT_EQ(8UL, request_log_.size()); |
| 168 EXPECT_EQ(kReloadTestPath, request_log_[0].relative_url); | 174 EXPECT_EQ(kReloadTestPath, request_log_[0].relative_url); |
| 169 EXPECT_EQ(kNoCacheControl, request_log_[0].cache_control); | 175 EXPECT_EQ(kNoCacheControl, request_log_[0].cache_control); |
| (...skipping 129 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 299 EXPECT_EQ(kReloadFramePath, request_log_[14].relative_url); | 305 EXPECT_EQ(kReloadFramePath, request_log_[14].relative_url); |
| 300 EXPECT_EQ(kNoCacheControl, request_log_[14].cache_control); | 306 EXPECT_EQ(kNoCacheControl, request_log_[14].cache_control); |
| 301 EXPECT_EQ(kReloadImagePath, request_log_[15].relative_url); | 307 EXPECT_EQ(kReloadImagePath, request_log_[15].relative_url); |
| 302 EXPECT_EQ(kNoCacheControl, request_log_[15].cache_control); | 308 EXPECT_EQ(kNoCacheControl, request_log_[15].cache_control); |
| 303 } | 309 } |
| 304 } | 310 } |
| 305 | 311 |
| 306 } // namespace | 312 } // namespace |
| 307 | 313 |
| 308 } // namespace content | 314 } // namespace content |
| OLD | NEW |