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

Side by Side Diff: components/sync/engine_impl/model_type_registry_unittest.cc

Issue 2422253002: [Sync] Rewriting ".reset(new" pattern to use "= base::MakeUnique" instead. (Closed)
Patch Set: Fixing compile. Created 4 years, 2 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 unified diff | Download patch
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 "components/sync/engine_impl/model_type_registry.h" 5 #include "components/sync/engine_impl/model_type_registry.h"
6 6
7 #include <utility> 7 #include <utility>
8 8
9 #include "base/deferred_sequenced_task_runner.h" 9 #include "base/deferred_sequenced_task_runner.h"
10 #include "base/memory/ptr_util.h" 10 #include "base/memory/ptr_util.h"
(...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after
74 void ModelTypeRegistryTest::SetUp() { 74 void ModelTypeRegistryTest::SetUp() {
75 dir_maker_.SetUp(); 75 dir_maker_.SetUp();
76 scoped_refptr<ModelSafeWorker> passive_worker( 76 scoped_refptr<ModelSafeWorker> passive_worker(
77 new FakeModelWorker(GROUP_PASSIVE)); 77 new FakeModelWorker(GROUP_PASSIVE));
78 scoped_refptr<ModelSafeWorker> ui_worker(new FakeModelWorker(GROUP_UI)); 78 scoped_refptr<ModelSafeWorker> ui_worker(new FakeModelWorker(GROUP_UI));
79 scoped_refptr<ModelSafeWorker> db_worker(new FakeModelWorker(GROUP_DB)); 79 scoped_refptr<ModelSafeWorker> db_worker(new FakeModelWorker(GROUP_DB));
80 workers_.push_back(passive_worker); 80 workers_.push_back(passive_worker);
81 workers_.push_back(ui_worker); 81 workers_.push_back(ui_worker);
82 workers_.push_back(db_worker); 82 workers_.push_back(db_worker);
83 83
84 registry_.reset( 84 registry_ = base::MakeUnique<ModelTypeRegistry>(workers_, directory(),
85 new ModelTypeRegistry(workers_, directory(), &mock_nudge_handler_)); 85 &mock_nudge_handler_);
86 } 86 }
87 87
88 void ModelTypeRegistryTest::TearDown() { 88 void ModelTypeRegistryTest::TearDown() {
89 registry_.reset(); 89 registry_.reset();
90 workers_.clear(); 90 workers_.clear();
91 dir_maker_.TearDown(); 91 dir_maker_.TearDown();
92 } 92 }
93 93
94 ModelTypeRegistry* ModelTypeRegistryTest::registry() { 94 ModelTypeRegistry* ModelTypeRegistryTest::registry() {
95 return registry_.get(); 95 return registry_.get();
(...skipping 166 matching lines...) Expand 10 before | Expand all | Expand 10 after
262 registry()->ConnectType( 262 registry()->ConnectType(
263 THEMES, 263 THEMES,
264 MakeActivationContext(model_type_state, 264 MakeActivationContext(model_type_state,
265 base::WrapUnique(new FakeModelTypeProcessor()))); 265 base::WrapUnique(new FakeModelTypeProcessor())));
266 266
267 EXPECT_EQ(ModelTypeSet(AUTOFILL, THEMES), 267 EXPECT_EQ(ModelTypeSet(AUTOFILL, THEMES),
268 registry()->GetInitialSyncEndedTypes()); 268 registry()->GetInitialSyncEndedTypes());
269 } 269 }
270 270
271 } // namespace syncer 271 } // namespace syncer
OLDNEW
« no previous file with comments | « components/sync/engine_impl/model_type_registry.cc ('k') | components/sync/engine_impl/model_type_worker_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698