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

Unified Diff: components/sync/driver/non_ui_model_type_controller_unittest.cc

Issue 2256733004: Re-write many calls to WrapUnique() with MakeUnique() (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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
Index: components/sync/driver/non_ui_model_type_controller_unittest.cc
diff --git a/components/sync/driver/non_ui_model_type_controller_unittest.cc b/components/sync/driver/non_ui_model_type_controller_unittest.cc
index 5d67af937791843dfef7a7c2844b4564d26eb668..a8d761d340f355a3f678d07598b27a14c382b0e3 100644
--- a/components/sync/driver/non_ui_model_type_controller_unittest.cc
+++ b/components/sync/driver/non_ui_model_type_controller_unittest.cc
@@ -76,7 +76,7 @@ class MockSyncBackend {
std::unique_ptr<syncer_v2::ActivationContext> activation_context) {
enabled_types_.Put(type);
activation_context->type_processor->ConnectSync(
- base::WrapUnique(new NullCommitQueue()));
+ base::MakeUnique<NullCommitQueue>());
}
void Disconnect(syncer::ModelType type) {
@@ -180,8 +180,7 @@ class NonUIModelTypeControllerTest : public testing::Test,
syncer::ModelType type,
syncer_v2::ModelTypeService* service) {
std::unique_ptr<syncer_v2::SharedModelTypeProcessor> processor =
- base::WrapUnique(
- new syncer_v2::SharedModelTypeProcessor(type, service));
+ base::MakeUnique<syncer_v2::SharedModelTypeProcessor>(type, service);
type_processor_ = processor.get();
return std::move(processor);
}
@@ -231,8 +230,7 @@ class NonUIModelTypeControllerTest : public testing::Test,
if (model_thread_runner_->BelongsToCurrentThread()) {
if (!type_processor_->IsAllowingChanges()) {
type_processor_->OnMetadataLoaded(
- syncer::SyncError(),
- base::WrapUnique(new syncer_v2::MetadataBatch()));
+ syncer::SyncError(), base::MakeUnique<syncer_v2::MetadataBatch>());
}
} else {
model_thread_runner_->PostTask(

Powered by Google App Engine
This is Rietveld 408576698