| 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 232 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 243 EXPECT_EQ(kReloadTestPath, request_log_[0].relative_url); | 243 EXPECT_EQ(kReloadTestPath, request_log_[0].relative_url); |
| 244 EXPECT_EQ(kNoCacheControl, request_log_[0].cache_control); | 244 EXPECT_EQ(kNoCacheControl, request_log_[0].cache_control); |
| 245 EXPECT_EQ(kReloadImagePath, request_log_[1].relative_url); | 245 EXPECT_EQ(kReloadImagePath, request_log_[1].relative_url); |
| 246 EXPECT_EQ(kNoCacheControl, request_log_[1].cache_control); | 246 EXPECT_EQ(kNoCacheControl, request_log_[1].cache_control); |
| 247 EXPECT_EQ(kReloadFramePath, request_log_[2].relative_url); | 247 EXPECT_EQ(kReloadFramePath, request_log_[2].relative_url); |
| 248 EXPECT_EQ(kNoCacheControl, request_log_[3].cache_control); | 248 EXPECT_EQ(kNoCacheControl, request_log_[3].cache_control); |
| 249 EXPECT_EQ(kReloadImagePath, request_log_[3].relative_url); | 249 EXPECT_EQ(kReloadImagePath, request_log_[3].relative_url); |
| 250 EXPECT_EQ(kNoCacheControl, request_log_[3].cache_control); | 250 EXPECT_EQ(kNoCacheControl, request_log_[3].cache_control); |
| 251 } | 251 } |
| 252 | 252 |
| 253 // TODO(crbug.com/671545): This test does not work correctly if browser-side | |
| 254 // navigation is enabled. | |
| 255 if (IsBrowserSideNavigationEnabled()) | |
| 256 return; | |
| 257 | |
| 258 // The second navigation is the same page navigation. This should be handled | 253 // The second navigation is the same page navigation. This should be handled |
| 259 // as a reload, revalidating the main resource, but following cache protocols | 254 // as a reload, revalidating the main resource, but following cache protocols |
| 260 // for others. | 255 // for others. |
| 261 { | 256 { |
| 262 base::AutoLock lock(request_log_lock_); | 257 base::AutoLock lock(request_log_lock_); |
| 263 | 258 |
| 264 // Only the top main resource should be requested with kMaxAgeCacheControl. | 259 // Only the top main resource should be requested with kMaxAgeCacheControl. |
| 265 EXPECT_EQ(kReloadTestPath, request_log_[4].relative_url); | 260 EXPECT_EQ(kReloadTestPath, request_log_[4].relative_url); |
| 266 EXPECT_EQ(kMaxAgeCacheControl, request_log_[4].cache_control); | 261 EXPECT_EQ(kMaxAgeCacheControl, request_log_[4].cache_control); |
| 267 EXPECT_EQ(kReloadImagePath, request_log_[5].relative_url); | 262 EXPECT_EQ(kReloadImagePath, request_log_[5].relative_url); |
| (...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 305 EXPECT_EQ(kReloadFramePath, request_log_[14].relative_url); | 300 EXPECT_EQ(kReloadFramePath, request_log_[14].relative_url); |
| 306 EXPECT_EQ(kNoCacheControl, request_log_[14].cache_control); | 301 EXPECT_EQ(kNoCacheControl, request_log_[14].cache_control); |
| 307 EXPECT_EQ(kReloadImagePath, request_log_[15].relative_url); | 302 EXPECT_EQ(kReloadImagePath, request_log_[15].relative_url); |
| 308 EXPECT_EQ(kNoCacheControl, request_log_[15].cache_control); | 303 EXPECT_EQ(kNoCacheControl, request_log_[15].cache_control); |
| 309 } | 304 } |
| 310 } | 305 } |
| 311 | 306 |
| 312 } // namespace | 307 } // namespace |
| 313 | 308 |
| 314 } // namespace content | 309 } // namespace content |
| OLD | NEW |