| OLD | NEW |
| 1 // Copyright (c) 2015 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2015 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 <algorithm> | 5 #include <algorithm> |
| 6 #include <memory> | 6 #include <memory> |
| 7 #include <set> | 7 #include <set> |
| 8 #include <string> | 8 #include <string> |
| 9 #include <vector> | 9 #include <vector> |
| 10 | 10 |
| (...skipping 228 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 239 CompareRemainingKeys(keys); | 239 CompareRemainingKeys(keys); |
| 240 } | 240 } |
| 241 | 241 |
| 242 // Tests that ConditionalCacheDeletionHelper correctly constructs a condition | 242 // Tests that ConditionalCacheDeletionHelper correctly constructs a condition |
| 243 // for time and URL. | 243 // for time and URL. |
| 244 // | 244 // |
| 245 // Note: This test depends on the timing in cache backends and can be flaky | 245 // Note: This test depends on the timing in cache backends and can be flaky |
| 246 // if those backends are slow. If this turns out to be a problem, consider | 246 // if those backends are slow. If this turns out to be a problem, consider |
| 247 // increasing the |timeout_ms| constant. | 247 // increasing the |timeout_ms| constant. |
| 248 // | 248 // |
| 249 // Flakily timing out on Mac 10.11: https://crbug.com/646119 | 249 // Flakily timing out on Mac 10.11 (crbug.com/646119) and flakily |
| 250 #if defined(OS_MACOSX) | 250 // failing on Linux/ChromeOS (crbug.com/624836). |
| 251 #if defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_CHROMEOS) |
| 251 #define MAYBE_TimeAndURL DISABLED_TimeAndURL | 252 #define MAYBE_TimeAndURL DISABLED_TimeAndURL |
| 252 #else | 253 #else |
| 253 #define MAYBE_TimeAndURL TimeAndURL | 254 #define MAYBE_TimeAndURL TimeAndURL |
| 254 #endif | 255 #endif |
| 255 IN_PROC_BROWSER_TEST_F(ConditionalCacheDeletionHelperBrowserTest, | 256 IN_PROC_BROWSER_TEST_F(ConditionalCacheDeletionHelperBrowserTest, |
| 256 MAYBE_TimeAndURL) { | 257 MAYBE_TimeAndURL) { |
| 257 const int64_t timeout_ms = 1; | 258 const int64_t timeout_ms = 1; |
| 258 | 259 |
| 259 // Create some entries. | 260 // Create some entries. |
| 260 std::set<std::string> keys; | 261 std::set<std::string> keys; |
| (...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 308 BrowserThread::IO, FROM_HERE, | 309 BrowserThread::IO, FROM_HERE, |
| 309 base::Bind(&ConditionalCacheDeletionHelperBrowserTest::GetRemainingKeys, | 310 base::Bind(&ConditionalCacheDeletionHelperBrowserTest::GetRemainingKeys, |
| 310 base::Unretained(this))); | 311 base::Unretained(this))); |
| 311 WaitForTasksOnIOThread(); | 312 WaitForTasksOnIOThread(); |
| 312 | 313 |
| 313 keys.insert(newer_keys.begin(), newer_keys.end()); | 314 keys.insert(newer_keys.begin(), newer_keys.end()); |
| 314 keys.erase("https://example.com/foo/bar/icon2.png"); | 315 keys.erase("https://example.com/foo/bar/icon2.png"); |
| 315 keys.erase("https://example.com/foo/bar/icon3.png"); | 316 keys.erase("https://example.com/foo/bar/icon3.png"); |
| 316 CompareRemainingKeys(keys); | 317 CompareRemainingKeys(keys); |
| 317 } | 318 } |
| OLD | NEW |