| OLD | NEW |
| 1 // Copyright 2017 The Chromium Authors. All rights reserved. | 1 // Copyright 2017 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 <stddef.h> | 5 #include <stddef.h> |
| 6 #include <stdint.h> | 6 #include <stdint.h> |
| 7 | 7 |
| 8 #include <list> | 8 #include <list> |
| 9 #include <memory> | 9 #include <memory> |
| 10 #include <set> | 10 #include <set> |
| (...skipping 208 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 219 storage_partition_removal_data_.remove_begin = begin; | 219 storage_partition_removal_data_.remove_begin = begin; |
| 220 storage_partition_removal_data_.remove_end = end; | 220 storage_partition_removal_data_.remove_end = end; |
| 221 storage_partition_removal_data_.origin_matcher = origin_matcher; | 221 storage_partition_removal_data_.origin_matcher = origin_matcher; |
| 222 storage_partition_removal_data_.cookie_matcher = cookie_matcher; | 222 storage_partition_removal_data_.cookie_matcher = cookie_matcher; |
| 223 | 223 |
| 224 BrowserThread::PostTask(BrowserThread::UI, FROM_HERE, | 224 BrowserThread::PostTask(BrowserThread::UI, FROM_HERE, |
| 225 base::Bind(&TestStoragePartition::AsyncRunCallback, | 225 base::Bind(&TestStoragePartition::AsyncRunCallback, |
| 226 base::Unretained(this), callback)); | 226 base::Unretained(this), callback)); |
| 227 } | 227 } |
| 228 | 228 |
| 229 void ClearHttpAndMediaCaches( |
| 230 const base::Time begin, |
| 231 const base::Time end, |
| 232 const base::Callback<bool(const GURL&)>& url_matcher, |
| 233 const base::Closure& callback) override { |
| 234 // Not needed in this test. |
| 235 } |
| 236 |
| 229 void Flush() override {} | 237 void Flush() override {} |
| 230 | 238 |
| 231 void ClearBluetoothAllowedDevicesMapForTesting() override {} | 239 void ClearBluetoothAllowedDevicesMapForTesting() override {} |
| 232 | 240 |
| 233 StoragePartitionRemovalData GetStoragePartitionRemovalData() { | 241 StoragePartitionRemovalData GetStoragePartitionRemovalData() { |
| 234 return storage_partition_removal_data_; | 242 return storage_partition_removal_data_; |
| 235 } | 243 } |
| 236 | 244 |
| 237 private: | 245 private: |
| 238 void AsyncRunCallback(const base::Closure& callback) { | 246 void AsyncRunCallback(const base::Closure& callback) { |
| (...skipping 1459 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1698 | 1706 |
| 1699 EXPECT_TRUE(remover->is_removing()); | 1707 EXPECT_TRUE(remover->is_removing()); |
| 1700 | 1708 |
| 1701 // Add one more deletion and wait for it. | 1709 // Add one more deletion and wait for it. |
| 1702 BlockUntilBrowsingDataRemoved( | 1710 BlockUntilBrowsingDataRemoved( |
| 1703 base::Time(), base::Time::Max(), BrowsingDataRemover::DATA_TYPE_COOKIES, | 1711 base::Time(), base::Time::Max(), BrowsingDataRemover::DATA_TYPE_COOKIES, |
| 1704 BrowsingDataRemover::ORIGIN_TYPE_UNPROTECTED_WEB); | 1712 BrowsingDataRemover::ORIGIN_TYPE_UNPROTECTED_WEB); |
| 1705 | 1713 |
| 1706 EXPECT_FALSE(remover->is_removing()); | 1714 EXPECT_FALSE(remover->is_removing()); |
| 1707 } | 1715 } |
| OLD | NEW |