Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(226)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: content/browser/cache_storage/cache_storage_manager_unittest.cc

Issue 2947753002: CacheStorage: Migrate to BindOnce/OnceCallback/OnceClosure (Closed)
Patch Set: Untangle Batch logic (relies on AdaptCallbackForRepeating) Created 3 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« content/browser/cache_storage/cache_storage_cache.cc ('K') | « content/browser/cache_storage/cache_storage_manager.cc ('k') | content/browser/cache_storage/cache_storage_operation.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/cache_storage/cache_storage_manager_unittest.cc
diff --git a/content/browser/cache_storage/cache_storage_manager_unittest.cc b/content/browser/cache_storage/cache_storage_manager_unittest.cc
index 825fada5673fee7d66b1333f48f8c3d1b00832a1..ef7a6d4caaec897fd367fac829cb69902b3a7f99 100644
--- a/content/browser/cache_storage/cache_storage_manager_unittest.cc
+++ b/content/browser/cache_storage/cache_storage_manager_unittest.cc
@@ -217,8 +217,8 @@ class CacheStorageManagerTest : public testing::Test {
base::RunLoop loop;
bool write_was_scheduled =
CacheStorageForOrigin(origin)->InitiateScheduledIndexWriteForTest(
- base::Bind(&CacheStorageManagerTest::BoolCallback,
- base::Unretained(this), &loop));
+ base::BindOnce(&CacheStorageManagerTest::BoolCallback,
+ base::Unretained(this), &loop));
loop.Run();
DCHECK(callback_bool_);
return write_was_scheduled;
@@ -250,8 +250,8 @@ class CacheStorageManagerTest : public testing::Test {
base::RunLoop loop;
cache_manager_->OpenCache(
origin, cache_name,
- base::Bind(&CacheStorageManagerTest::CacheAndErrorCallback,
- base::Unretained(this), base::Unretained(&loop)));
+ base::BindOnce(&CacheStorageManagerTest::CacheAndErrorCallback,
+ base::Unretained(this), base::Unretained(&loop)));
loop.Run();
bool error = callback_error_ != CACHE_STORAGE_OK;
@@ -266,8 +266,8 @@ class CacheStorageManagerTest : public testing::Test {
base::RunLoop loop;
cache_manager_->HasCache(
origin, cache_name,
- base::Bind(&CacheStorageManagerTest::BoolAndErrorCallback,
- base::Unretained(this), base::Unretained(&loop)));
+ base::BindOnce(&CacheStorageManagerTest::BoolAndErrorCallback,
+ base::Unretained(this), base::Unretained(&loop)));
loop.Run();
return callback_bool_;
@@ -277,8 +277,8 @@ class CacheStorageManagerTest : public testing::Test {
base::RunLoop loop;
cache_manager_->DeleteCache(
origin, cache_name,
- base::Bind(&CacheStorageManagerTest::BoolAndErrorCallback,
- base::Unretained(this), base::Unretained(&loop)));
+ base::BindOnce(&CacheStorageManagerTest::BoolAndErrorCallback,
+ base::Unretained(this), base::Unretained(&loop)));
loop.Run();
return callback_bool_;
@@ -287,8 +287,9 @@ class CacheStorageManagerTest : public testing::Test {
size_t Keys(const GURL& origin) {
base::RunLoop loop;
cache_manager_->EnumerateCaches(
- origin, base::Bind(&CacheStorageManagerTest::CacheMetadataCallback,
- base::Unretained(this), base::Unretained(&loop)));
+ origin,
+ base::BindOnce(&CacheStorageManagerTest::CacheMetadataCallback,
+ base::Unretained(this), base::Unretained(&loop)));
loop.Run();
return callback_cache_index_.num_entries();
}
@@ -315,8 +316,8 @@ class CacheStorageManagerTest : public testing::Test {
base::RunLoop loop;
cache_manager_->MatchCache(
origin, cache_name, std::move(unique_request), match_params,
- base::Bind(&CacheStorageManagerTest::CacheMatchCallback,
- base::Unretained(this), base::Unretained(&loop)));
+ base::BindOnce(&CacheStorageManagerTest::CacheMatchCallback,
+ base::Unretained(this), base::Unretained(&loop)));
loop.Run();
return callback_error_ == CACHE_STORAGE_OK;
@@ -341,8 +342,8 @@ class CacheStorageManagerTest : public testing::Test {
base::RunLoop loop;
cache_manager_->MatchAllCaches(
origin, std::move(unique_request), match_params,
- base::Bind(&CacheStorageManagerTest::CacheMatchCallback,
- base::Unretained(this), base::Unretained(&loop)));
+ base::BindOnce(&CacheStorageManagerTest::CacheMatchCallback,
+ base::Unretained(this), base::Unretained(&loop)));
loop.Run();
return callback_error_ == CACHE_STORAGE_OK;
@@ -395,8 +396,8 @@ class CacheStorageManagerTest : public testing::Test {
base::RunLoop loop;
cache->BatchOperation(
std::vector<CacheStorageBatchOperation>(1, operation),
- base::Bind(&CacheStorageManagerTest::CachePutCallback,
- base::Unretained(this), base::Unretained(&loop)));
+ base::BindOnce(&CacheStorageManagerTest::CachePutCallback,
+ base::Unretained(this), base::Unretained(&loop)));
loop.Run();
return callback_error_ == CACHE_STORAGE_OK;
@@ -407,9 +408,10 @@ class CacheStorageManagerTest : public testing::Test {
new ServiceWorkerFetchRequest());
request->url = url;
base::RunLoop loop;
- cache->Match(std::move(request), CacheStorageCacheQueryParams(),
- base::Bind(&CacheStorageManagerTest::CacheMatchCallback,
- base::Unretained(this), base::Unretained(&loop)));
+ cache->Match(
+ std::move(request), CacheStorageCacheQueryParams(),
+ base::BindOnce(&CacheStorageManagerTest::CacheMatchCallback,
+ base::Unretained(this), base::Unretained(&loop)));
loop.Run();
return callback_error_ == CACHE_STORAGE_OK;
@@ -453,8 +455,8 @@ class CacheStorageManagerTest : public testing::Test {
base::RunLoop loop;
CacheStorage* cache_storage = CacheStorageForOrigin(origin);
cache_storage->GetSizeThenCloseAllCaches(
- base::Bind(&CacheStorageManagerTest::UsageCallback,
- base::Unretained(this), &loop));
+ base::BindOnce(&CacheStorageManagerTest::UsageCallback,
+ base::Unretained(this), &loop));
loop.Run();
return callback_usage_;
}
@@ -462,8 +464,8 @@ class CacheStorageManagerTest : public testing::Test {
int64_t Size(const GURL& origin) {
base::RunLoop loop;
CacheStorage* cache_storage = CacheStorageForOrigin(origin);
- cache_storage->Size(base::Bind(&CacheStorageManagerTest::UsageCallback,
- base::Unretained(this), &loop));
+ cache_storage->Size(base::BindOnce(&CacheStorageManagerTest::UsageCallback,
+ base::Unretained(this), &loop));
loop.Run();
return callback_usage_;
}
@@ -944,8 +946,8 @@ TEST_P(CacheStorageManagerTestP, OpenRunsSerially) {
base::RunLoop open_loop;
cache_manager_->OpenCache(
origin1_, "foo",
- base::Bind(&CacheStorageManagerTest::CacheAndErrorCallback,
- base::Unretained(this), base::Unretained(&open_loop)));
+ base::BindOnce(&CacheStorageManagerTest::CacheAndErrorCallback,
+ base::Unretained(this), base::Unretained(&open_loop)));
base::RunLoop().RunUntilIdle();
EXPECT_FALSE(callback_cache_handle_);
« content/browser/cache_storage/cache_storage_cache.cc ('K') | « content/browser/cache_storage/cache_storage_manager.cc ('k') | content/browser/cache_storage/cache_storage_operation.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698