| 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 |
| 11 #include "base/run_loop.h" | 11 #include "base/run_loop.h" |
| 12 #include "base/strings/string_number_conversions.h" | 12 #include "base/strings/string_number_conversions.h" |
| 13 #include "base/threading/platform_thread.h" | 13 #include "base/threading/platform_thread.h" |
| 14 #include "chrome/browser/profiles/profile.h" | 14 #include "chrome/browser/profiles/profile.h" |
| 15 #include "chrome/browser/ui/browser.h" | 15 #include "chrome/browser/ui/browser.h" |
| 16 #include "chrome/test/base/in_process_browser_test.h" | 16 #include "chrome/test/base/in_process_browser_test.h" |
| 17 #include "components/browsing_data/conditional_cache_deletion_helper.h" | 17 #include "components/browsing_data/content/conditional_cache_deletion_helper.h" |
| 18 #include "content/public/browser/browser_context.h" | 18 #include "content/public/browser/browser_context.h" |
| 19 #include "content/public/browser/browser_thread.h" | 19 #include "content/public/browser/browser_thread.h" |
| 20 #include "content/public/browser/storage_partition.h" | 20 #include "content/public/browser/storage_partition.h" |
| 21 #include "net/disk_cache/disk_cache.h" | 21 #include "net/disk_cache/disk_cache.h" |
| 22 #include "net/http/http_cache.h" | 22 #include "net/http/http_cache.h" |
| 23 #include "net/url_request/url_request_context.h" | 23 #include "net/url_request/url_request_context.h" |
| 24 #include "net/url_request/url_request_context_getter.h" | 24 #include "net/url_request/url_request_context_getter.h" |
| 25 | 25 |
| 26 using browsing_data::ConditionalCacheDeletionHelper; | 26 using browsing_data::ConditionalCacheDeletionHelper; |
| 27 using content::BrowserThread; | 27 using content::BrowserThread; |
| (...skipping 272 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 300 BrowserThread::IO, FROM_HERE, | 300 BrowserThread::IO, FROM_HERE, |
| 301 base::Bind(&ConditionalCacheDeletionHelperBrowserTest::GetRemainingKeys, | 301 base::Bind(&ConditionalCacheDeletionHelperBrowserTest::GetRemainingKeys, |
| 302 base::Unretained(this))); | 302 base::Unretained(this))); |
| 303 WaitForTasksOnIOThread(); | 303 WaitForTasksOnIOThread(); |
| 304 | 304 |
| 305 keys.insert(newer_keys.begin(), newer_keys.end()); | 305 keys.insert(newer_keys.begin(), newer_keys.end()); |
| 306 keys.erase("https://example.com/foo/bar/icon2.png"); | 306 keys.erase("https://example.com/foo/bar/icon2.png"); |
| 307 keys.erase("https://example.com/foo/bar/icon3.png"); | 307 keys.erase("https://example.com/foo/bar/icon3.png"); |
| 308 CompareRemainingKeys(keys); | 308 CompareRemainingKeys(keys); |
| 309 } | 309 } |
| OLD | NEW |