From 5f07ce2578fb40622d2e9592fe73c1b00101f85b Mon Sep 17 00:00:00 2001 From: Mikel Astiz Date: Mon, 5 Mar 2018 07:52:28 +0000 Subject: [PATCH] Adopt OnceCallback in ModelTypeStore Trivial change, no behavioral differences. Bug: 681921 Change-Id: Id512b11a574afcf902d35553bb10a1a85cbcdea7 Reviewed-on: https://chromium-review.googlesource.com/940134 Reviewed-by: Sean Kau Reviewed-by: Marc Treib Reviewed-by: Sylvain Defresne Reviewed-by: Pavel Yatsuk Commit-Queue: Mikel Astiz Cr-Commit-Position: refs/heads/master@{#540790} --- .../chromeos/printing/printers_sync_bridge.cc | 4 ++-- .../webdata/autocomplete_sync_bridge.cc | 4 ++-- .../core/browser/typed_url_sync_bridge.cc | 4 ++-- .../reading_list/core/reading_list_store.cc | 4 ++-- .../device_info/device_info_sync_bridge.cc | 4 ++-- .../sync/model/fake_model_type_sync_bridge.cc | 4 ++-- components/sync/model/model_type_sync_bridge.h | 2 +- .../shared_model_type_processor_unittest.cc | 13 ++++++------- .../sync/user_events/user_event_sync_bridge.cc | 18 ++++++++++-------- 9 files changed, 29 insertions(+), 28 deletions(-) diff --git a/chrome/browser/chromeos/printing/printers_sync_bridge.cc b/chrome/browser/chromeos/printing/printers_sync_bridge.cc index a7e2701896dc25..08a1dc5cca78ec 100644 --- a/chrome/browser/chromeos/printing/printers_sync_bridge.cc +++ b/chrome/browser/chromeos/printing/printers_sync_bridge.cc @@ -252,7 +252,7 @@ void PrintersSyncBridge::GetData(StorageKeyList storage_keys, } } } - callback.Run(std::move(batch)); + std::move(callback).Run(std::move(batch)); } void PrintersSyncBridge::GetAllData(DataCallback callback) { @@ -263,7 +263,7 @@ void PrintersSyncBridge::GetAllData(DataCallback callback) { batch->Put(entry.first, CopyToEntityData(*entry.second)); } } - callback.Run(std::move(batch)); + std::move(callback).Run(std::move(batch)); } std::string PrintersSyncBridge::GetClientTag(const EntityData& entity_data) { diff --git a/components/autofill/core/browser/webdata/autocomplete_sync_bridge.cc b/components/autofill/core/browser/webdata/autocomplete_sync_bridge.cc index 44d20684d6523f..bcdcc18d7195c5 100644 --- a/components/autofill/core/browser/webdata/autocomplete_sync_bridge.cc +++ b/components/autofill/core/browser/webdata/autocomplete_sync_bridge.cc @@ -382,7 +382,7 @@ void AutocompleteSyncBridge::AutocompleteSyncBridge::GetData( batch->Put(key, CreateEntityData(entry)); } } - callback.Run(std::move(batch)); + std::move(callback).Run(std::move(batch)); } void AutocompleteSyncBridge::GetAllData(DataCallback callback) { @@ -399,7 +399,7 @@ void AutocompleteSyncBridge::GetAllData(DataCallback callback) { for (const AutofillEntry& entry : entries) { batch->Put(GetStorageKeyFromModel(entry.key()), CreateEntityData(entry)); } - callback.Run(std::move(batch)); + std::move(callback).Run(std::move(batch)); } void AutocompleteSyncBridge::ActOnLocalChanges( diff --git a/components/history/core/browser/typed_url_sync_bridge.cc b/components/history/core/browser/typed_url_sync_bridge.cc index e1e05051d1dea8..84610a32b14922 100644 --- a/components/history/core/browser/typed_url_sync_bridge.cc +++ b/components/history/core/browser/typed_url_sync_bridge.cc @@ -288,7 +288,7 @@ void TypedURLSyncBridge::GetData(StorageKeyList storage_keys, batch->Put(key, std::move(entity_data)); } - callback.Run(std::move(batch)); + std::move(callback).Run(std::move(batch)); } void TypedURLSyncBridge::GetAllData(DataCallback callback) { @@ -318,7 +318,7 @@ void TypedURLSyncBridge::GetAllData(DataCallback callback) { batch->Put(GetStorageKeyFromURLRow(url), std::move(entity_data)); } - callback.Run(std::move(batch)); + std::move(callback).Run(std::move(batch)); } // Must be exactly the value of GURL::spec() for backwards comparability with diff --git a/components/reading_list/core/reading_list_store.cc b/components/reading_list/core/reading_list_store.cc index 62fbb31c9554a1..9ec4ab62f4177a 100644 --- a/components/reading_list/core/reading_list_store.cc +++ b/components/reading_list/core/reading_list_store.cc @@ -367,7 +367,7 @@ void ReadingListStore::GetData(StorageKeyList storage_keys, } } - callback.Run(std::move(batch)); + std::move(callback).Run(std::move(batch)); } void ReadingListStore::GetAllData(DataCallback callback) { @@ -379,7 +379,7 @@ void ReadingListStore::GetAllData(DataCallback callback) { AddEntryToBatch(batch.get(), *entry); } - callback.Run(std::move(batch)); + std::move(callback).Run(std::move(batch)); } void ReadingListStore::AddEntryToBatch(syncer::MutableDataBatch* batch, diff --git a/components/sync/device_info/device_info_sync_bridge.cc b/components/sync/device_info/device_info_sync_bridge.cc index 5241f6123921db..7796191e62f60b 100644 --- a/components/sync/device_info/device_info_sync_bridge.cc +++ b/components/sync/device_info/device_info_sync_bridge.cc @@ -214,7 +214,7 @@ void DeviceInfoSyncBridge::GetData(StorageKeyList storage_keys, batch->Put(key, CopyToEntityData(*iter->second)); } } - callback.Run(std::move(batch)); + std::move(callback).Run(std::move(batch)); } void DeviceInfoSyncBridge::GetAllData(DataCallback callback) { @@ -222,7 +222,7 @@ void DeviceInfoSyncBridge::GetAllData(DataCallback callback) { for (const auto& kv : all_data_) { batch->Put(kv.first, CopyToEntityData(*kv.second)); } - callback.Run(std::move(batch)); + std::move(callback).Run(std::move(batch)); } std::string DeviceInfoSyncBridge::GetClientTag(const EntityData& entity_data) { diff --git a/components/sync/model/fake_model_type_sync_bridge.cc b/components/sync/model/fake_model_type_sync_bridge.cc index 6f25647115bb2e..41496a1dead797 100644 --- a/components/sync/model/fake_model_type_sync_bridge.cc +++ b/components/sync/model/fake_model_type_sync_bridge.cc @@ -314,7 +314,7 @@ void FakeModelTypeSyncBridge::GetData(StorageKeyList keys, DCHECK(db_->HasData(key)) << "No data for " << key; batch->Put(key, CopyEntityData(db_->GetData(key))); } - callback.Run(std::move(batch)); + std::move(callback).Run(std::move(batch)); } void FakeModelTypeSyncBridge::GetAllData(DataCallback callback) { @@ -328,7 +328,7 @@ void FakeModelTypeSyncBridge::GetAllData(DataCallback callback) { for (const auto& kv : db_->all_data()) { batch->Put(kv.first, CopyEntityData(*kv.second)); } - callback.Run(std::move(batch)); + std::move(callback).Run(std::move(batch)); } std::string FakeModelTypeSyncBridge::GetClientTag( diff --git a/components/sync/model/model_type_sync_bridge.h b/components/sync/model/model_type_sync_bridge.h index 9cb1859112a12f..f3a85bd248e234 100644 --- a/components/sync/model/model_type_sync_bridge.h +++ b/components/sync/model/model_type_sync_bridge.h @@ -34,7 +34,7 @@ class MetadataChangeList; // ReportError() method should be called instead of ModelReadyToSync(). class ModelTypeSyncBridge : public base::SupportsWeakPtr { public: - using DataCallback = base::Callback)>; + using DataCallback = base::OnceCallback)>; using StorageKeyList = std::vector; using ChangeProcessorFactory = base::RepeatingCallback(ModelType type, ModelTypeSyncBridge* bridge)>; diff --git a/components/sync/model_impl/shared_model_type_processor_unittest.cc b/components/sync/model_impl/shared_model_type_processor_unittest.cc index dbd881a2affc01..3d0f6eaf202f85 100644 --- a/components/sync/model_impl/shared_model_type_processor_unittest.cc +++ b/components/sync/model_impl/shared_model_type_processor_unittest.cc @@ -90,8 +90,7 @@ class TestModelTypeSyncBridge : public FakeModelTypeSyncBridge { void OnPendingCommitDataLoaded() { ASSERT_TRUE(data_callback_); - data_callback_.Run(); - data_callback_.Reset(); + std::move(data_callback_).Run(); } void InitializeToReadyState() { @@ -133,11 +132,11 @@ class TestModelTypeSyncBridge : public FakeModelTypeSyncBridge { void GetData(StorageKeyList keys, DataCallback callback) override { if (synchronous_data_callback_) { synchronous_data_callback_ = false; - FakeModelTypeSyncBridge::GetData(keys, callback); + FakeModelTypeSyncBridge::GetData(keys, std::move(callback)); } else { FakeModelTypeSyncBridge::GetData( - keys, base::Bind(&TestModelTypeSyncBridge::CaptureDataCallback, - base::Unretained(this), callback)); + keys, base::BindOnce(&TestModelTypeSyncBridge::CaptureDataCallback, + base::Unretained(this), std::move(callback))); } } @@ -145,7 +144,7 @@ class TestModelTypeSyncBridge : public FakeModelTypeSyncBridge { void CaptureDataCallback(DataCallback callback, std::unique_ptr data) { EXPECT_FALSE(data_callback_); - data_callback_ = base::Bind(callback, base::Passed(std::move(data))); + data_callback_ = base::BindOnce(std::move(callback), std::move(data)); } // The number of times MergeSyncData has been called. @@ -154,7 +153,7 @@ class TestModelTypeSyncBridge : public FakeModelTypeSyncBridge { int get_storage_key_call_count_ = 0; // Stores the data callback between GetData() and OnPendingCommitDataLoaded(). - base::Closure data_callback_; + base::OnceClosure data_callback_; // Whether to return GetData results synchronously. Overrides the default // callback capture behavior if set to true. diff --git a/components/sync/user_events/user_event_sync_bridge.cc b/components/sync/user_events/user_event_sync_bridge.cc index 6793eb6f5298e9..18c2157f9b9dcc 100644 --- a/components/sync/user_events/user_event_sync_bridge.cc +++ b/components/sync/user_events/user_event_sync_bridge.cc @@ -125,13 +125,15 @@ base::Optional UserEventSyncBridge::ApplySyncChanges( void UserEventSyncBridge::GetData(StorageKeyList storage_keys, DataCallback callback) { - store_->ReadData(storage_keys, base::Bind(&UserEventSyncBridge::OnReadData, - base::AsWeakPtr(this), callback)); + store_->ReadData(storage_keys, + base::BindOnce(&UserEventSyncBridge::OnReadData, + base::AsWeakPtr(this), std::move(callback))); } void UserEventSyncBridge::GetAllData(DataCallback callback) { - store_->ReadAllData(base::Bind(&UserEventSyncBridge::OnReadAllData, - base::AsWeakPtr(this), callback)); + store_->ReadAllData(base::BindOnce(&UserEventSyncBridge::OnReadAllData, + base::AsWeakPtr(this), + std::move(callback))); } std::string UserEventSyncBridge::GetClientTag(const EntityData& entity_data) { @@ -144,8 +146,8 @@ std::string UserEventSyncBridge::GetStorageKey(const EntityData& entity_data) { void UserEventSyncBridge::DisableSync() { // No data should be retained through sign out. - store_->ReadAllData(base::Bind(&UserEventSyncBridge::OnReadAllDataToDelete, - base::AsWeakPtr(this))); + store_->ReadAllData(base::BindOnce( + &UserEventSyncBridge::OnReadAllDataToDelete, base::AsWeakPtr(this))); } void UserEventSyncBridge::RecordUserEvent( @@ -234,7 +236,7 @@ void UserEventSyncBridge::OnReadData(DataCallback callback, const base::Optional& error, std::unique_ptr data_records, std::unique_ptr missing_id_list) { - OnReadAllData(callback, error, std::move(data_records)); + OnReadAllData(std::move(callback), error, std::move(data_records)); } void UserEventSyncBridge::OnReadAllData( @@ -258,7 +260,7 @@ void UserEventSyncBridge::OnReadAllData( return; } } - callback.Run(std::move(batch)); + std::move(callback).Run(std::move(batch)); } void UserEventSyncBridge::OnReadAllDataToDelete(