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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/extensions/api/storage/settings_sync_unittest.cc

Issue 2257113002: Re-write many calls to WrapUnique() with MakeUnique() (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 4 years, 4 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
« no previous file with comments | « chrome/browser/extensions/api/storage/policy_value_store_unittest.cc ('k') | chrome/browser/extensions/api/storage/sync_storage_backend.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/extensions/api/storage/settings_sync_unittest.cc
diff --git a/chrome/browser/extensions/api/storage/settings_sync_unittest.cc b/chrome/browser/extensions/api/storage/settings_sync_unittest.cc
index 58f846246bbd4d22d3c58de6ccc5c6acb34f6065..c35a85d063f97a6900858af03ea23d8bd54d06c1 100644
--- a/chrome/browser/extensions/api/storage/settings_sync_unittest.cc
+++ b/chrome/browser/extensions/api/storage/settings_sync_unittest.cc
@@ -171,12 +171,12 @@ class MockSyncChangeProcessor : public syncer::SyncChangeProcessor {
std::unique_ptr<KeyedService> MockExtensionSystemFactoryFunction(
content::BrowserContext* context) {
- return base::WrapUnique(new MockExtensionSystem(context));
+ return base::MakeUnique<MockExtensionSystem>(context);
}
std::unique_ptr<KeyedService> BuildEventRouter(
content::BrowserContext* profile) {
- return base::WrapUnique(new extensions::EventRouter(profile, nullptr));
+ return base::MakeUnique<extensions::EventRouter>(profile, nullptr);
}
} // namespace
@@ -288,7 +288,7 @@ TEST_F(ExtensionSettingsSyncTest, NoDataDoesNotInvokeSync) {
->MergeDataAndStartSyncing(
model_type, syncer::SyncDataList(),
std::move(sync_processor_wrapper_),
- base::WrapUnique(new syncer::SyncErrorFactoryMock()));
+ base::MakeUnique<syncer::SyncErrorFactoryMock>());
AddExtensionAndGetStorage("s2", type);
EXPECT_EQ(0u, GetAllSyncData(model_type).size());
@@ -329,7 +329,7 @@ TEST_F(ExtensionSettingsSyncTest, InSyncDataDoesNotInvokeSync) {
GetSyncableService(model_type)
->MergeDataAndStartSyncing(
model_type, sync_data, std::move(sync_processor_wrapper_),
- base::WrapUnique(new syncer::SyncErrorFactoryMock()));
+ base::MakeUnique<syncer::SyncErrorFactoryMock>());
// Already in sync, so no changes.
EXPECT_EQ(0u, sync_processor_->changes().size());
@@ -366,7 +366,7 @@ TEST_F(ExtensionSettingsSyncTest, LocalDataWithNoSyncDataIsPushedToSync) {
->MergeDataAndStartSyncing(
model_type, syncer::SyncDataList(),
std::move(sync_processor_wrapper_),
- base::WrapUnique(new syncer::SyncErrorFactoryMock()));
+ base::MakeUnique<syncer::SyncErrorFactoryMock>());
// All settings should have been pushed to sync.
EXPECT_EQ(2u, sync_processor_->changes().size());
@@ -404,7 +404,7 @@ TEST_F(ExtensionSettingsSyncTest, AnySyncDataOverwritesLocalData) {
GetSyncableService(model_type)
->MergeDataAndStartSyncing(
model_type, sync_data, std::move(sync_processor_wrapper_),
- base::WrapUnique(new syncer::SyncErrorFactoryMock()));
+ base::MakeUnique<syncer::SyncErrorFactoryMock>());
expected1.Set("foo", value1.DeepCopy());
expected2.Set("bar", value2.DeepCopy());
@@ -446,7 +446,7 @@ TEST_F(ExtensionSettingsSyncTest, ProcessSyncChanges) {
GetSyncableService(model_type)
->MergeDataAndStartSyncing(
model_type, sync_data, std::move(sync_processor_wrapper_),
- base::WrapUnique(new syncer::SyncErrorFactoryMock()));
+ base::MakeUnique<syncer::SyncErrorFactoryMock>());
expected2.Set("bar", value2.DeepCopy());
// Make sync add some settings.
@@ -520,7 +520,7 @@ TEST_F(ExtensionSettingsSyncTest, PushToSync) {
GetSyncableService(model_type)
->MergeDataAndStartSyncing(
model_type, sync_data, std::move(sync_processor_wrapper_),
- base::WrapUnique(new syncer::SyncErrorFactoryMock()));
+ base::MakeUnique<syncer::SyncErrorFactoryMock>());
// Add something locally.
storage1->Set(DEFAULTS, "bar", value2);
@@ -658,7 +658,7 @@ TEST_F(ExtensionSettingsSyncTest, ExtensionAndAppSettingsSyncSeparately) {
->MergeDataAndStartSyncing(
syncer::EXTENSION_SETTINGS, sync_data,
std::move(sync_processor_wrapper_),
- base::WrapUnique(new syncer::SyncErrorFactoryMock()));
+ base::MakeUnique<syncer::SyncErrorFactoryMock>());
GetSyncableService(syncer::EXTENSION_SETTINGS)->
StopSyncing(syncer::EXTENSION_SETTINGS);
EXPECT_EQ(0u, sync_processor_->changes().size());
@@ -673,7 +673,7 @@ TEST_F(ExtensionSettingsSyncTest, ExtensionAndAppSettingsSyncSeparately) {
GetSyncableService(syncer::APP_SETTINGS)
->MergeDataAndStartSyncing(
syncer::APP_SETTINGS, sync_data, std::move(app_settings_delegate_),
- base::WrapUnique(new syncer::SyncErrorFactoryMock()));
+ base::MakeUnique<syncer::SyncErrorFactoryMock>());
GetSyncableService(syncer::APP_SETTINGS)->
StopSyncing(syncer::APP_SETTINGS);
EXPECT_EQ(0u, sync_processor_->changes().size());
@@ -704,7 +704,7 @@ TEST_F(ExtensionSettingsSyncTest, FailingStartSyncingDisablesSync) {
GetSyncableService(model_type)
->MergeDataAndStartSyncing(
model_type, sync_data, std::move(sync_processor_wrapper_),
- base::WrapUnique(new syncer::SyncErrorFactoryMock()));
+ base::MakeUnique<syncer::SyncErrorFactoryMock>());
}
GetExisting("bad")->set_status_code(ValueStore::OK);
@@ -820,7 +820,7 @@ TEST_F(ExtensionSettingsSyncTest, FailingStartSyncingDisablesSync) {
->MergeDataAndStartSyncing(
model_type, syncer::SyncDataList(),
std::move(sync_processor_wrapper_),
- base::WrapUnique(new syncer::SyncErrorFactoryMock()));
+ base::MakeUnique<syncer::SyncErrorFactoryMock>());
// Local settings will have been pushed to sync, since it's empty (in this
// test; presumably it wouldn't be live, since we've been getting changes).
@@ -888,7 +888,7 @@ TEST_F(ExtensionSettingsSyncTest, FailingProcessChangesDisablesSync) {
GetSyncableService(model_type)
->MergeDataAndStartSyncing(
model_type, sync_data, std::move(sync_processor_wrapper_),
- base::WrapUnique(new syncer::SyncErrorFactoryMock()));
+ base::MakeUnique<syncer::SyncErrorFactoryMock>());
}
EXPECT_EQ(0u, sync_processor_->changes().size());
@@ -989,7 +989,7 @@ TEST_F(ExtensionSettingsSyncTest, FailingGetAllSyncDataDoesntStopSync) {
->MergeDataAndStartSyncing(
model_type, syncer::SyncDataList(),
std::move(sync_processor_wrapper_),
- base::WrapUnique(new syncer::SyncErrorFactoryMock()));
+ base::MakeUnique<syncer::SyncErrorFactoryMock>());
EXPECT_EQ(syncer::SyncChange::ACTION_ADD,
sync_processor_->GetOnlyChange("good", "foo")->change_type());
@@ -1028,7 +1028,7 @@ TEST_F(ExtensionSettingsSyncTest, FailureToReadChangesToPushDisablesSync) {
->MergeDataAndStartSyncing(
model_type, syncer::SyncDataList(),
std::move(sync_processor_wrapper_),
- base::WrapUnique(new syncer::SyncErrorFactoryMock()));
+ base::MakeUnique<syncer::SyncErrorFactoryMock>());
GetExisting("bad")->set_status_code(ValueStore::OK);
EXPECT_EQ(syncer::SyncChange::ACTION_ADD,
@@ -1078,7 +1078,7 @@ TEST_F(ExtensionSettingsSyncTest, FailureToReadChangesToPushDisablesSync) {
->MergeDataAndStartSyncing(
model_type, syncer::SyncDataList(),
std::move(sync_processor_wrapper_),
- base::WrapUnique(new syncer::SyncErrorFactoryMock()));
+ base::MakeUnique<syncer::SyncErrorFactoryMock>());
EXPECT_EQ(syncer::SyncChange::ACTION_ADD,
sync_processor_->GetOnlyChange("good", "foo")->change_type());
@@ -1119,7 +1119,7 @@ TEST_F(ExtensionSettingsSyncTest, FailureToPushLocalStateDisablesSync) {
->MergeDataAndStartSyncing(
model_type, syncer::SyncDataList(),
std::move(sync_processor_wrapper_),
- base::WrapUnique(new syncer::SyncErrorFactoryMock()));
+ base::MakeUnique<syncer::SyncErrorFactoryMock>());
sync_processor_->set_fail_all_requests(false);
// Changes from good will be send to sync, changes from bad won't.
@@ -1162,7 +1162,7 @@ TEST_F(ExtensionSettingsSyncTest, FailureToPushLocalStateDisablesSync) {
->MergeDataAndStartSyncing(
model_type, syncer::SyncDataList(),
std::move(sync_processor_wrapper_),
- base::WrapUnique(new syncer::SyncErrorFactoryMock()));
+ base::MakeUnique<syncer::SyncErrorFactoryMock>());
EXPECT_EQ(syncer::SyncChange::ACTION_ADD,
sync_processor_->GetOnlyChange("good", "foo")->change_type());
@@ -1197,7 +1197,7 @@ TEST_F(ExtensionSettingsSyncTest, FailureToPushLocalChangeDisablesSync) {
->MergeDataAndStartSyncing(
model_type, syncer::SyncDataList(),
std::move(sync_processor_wrapper_),
- base::WrapUnique(new syncer::SyncErrorFactoryMock()));
+ base::MakeUnique<syncer::SyncErrorFactoryMock>());
// bad will fail to send changes.
good->Set(DEFAULTS, "foo", fooValue);
@@ -1249,7 +1249,7 @@ TEST_F(ExtensionSettingsSyncTest, FailureToPushLocalChangeDisablesSync) {
->MergeDataAndStartSyncing(
model_type, syncer::SyncDataList(),
std::move(sync_processor_wrapper_),
- base::WrapUnique(new syncer::SyncErrorFactoryMock()));
+ base::MakeUnique<syncer::SyncErrorFactoryMock>());
EXPECT_EQ(syncer::SyncChange::ACTION_ADD,
sync_processor_->GetOnlyChange("good", "foo")->change_type());
@@ -1286,7 +1286,7 @@ TEST_F(ExtensionSettingsSyncTest,
->MergeDataAndStartSyncing(
model_type, syncer::SyncDataList(),
std::move(sync_processor_wrapper_),
- base::WrapUnique(new syncer::SyncErrorFactoryMock()));
+ base::MakeUnique<syncer::SyncErrorFactoryMock>());
// Large local change rejected and doesn't get sent out.
ValueStore* storage1 = AddExtensionAndGetStorage("s1", type);
@@ -1329,7 +1329,7 @@ TEST_F(ExtensionSettingsSyncTest, Dots) {
GetSyncableService(model_type)
->MergeDataAndStartSyncing(
model_type, sync_data_list, std::move(sync_processor_wrapper_),
- base::WrapUnique(new syncer::SyncErrorFactoryMock()));
+ base::MakeUnique<syncer::SyncErrorFactoryMock>());
}
// Test dots in keys that come from sync.
« no previous file with comments | « chrome/browser/extensions/api/storage/policy_value_store_unittest.cc ('k') | chrome/browser/extensions/api/storage/sync_storage_backend.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698