Index: components/sync/driver/ui_model_type_controller_unittest.cc |
diff --git a/components/sync/driver/ui_model_type_controller_unittest.cc b/components/sync/driver/ui_model_type_controller_unittest.cc |
index 45939ea0cdb09a4ca238d664bf4e2da38d048df6..1d975b8ac160bc880d3708e4c36f5e74dff6b287 100644 |
--- a/components/sync/driver/ui_model_type_controller_unittest.cc |
+++ b/components/sync/driver/ui_model_type_controller_unittest.cc |
@@ -4,6 +4,9 @@ |
#include "components/sync/driver/ui_model_type_controller.h" |
+#include <memory> |
+#include <utility> |
+ |
#include "base/bind.h" |
#include "base/callback.h" |
#include "base/logging.h" |
@@ -27,23 +30,6 @@ namespace sync_driver_v2 { |
namespace { |
-// Test controller derived from UIModelTypeController. |
-class TestUIModelTypeController : public UIModelTypeController { |
- public: |
- TestUIModelTypeController( |
- const scoped_refptr<base::SingleThreadTaskRunner>& ui_thread, |
- const base::Closure& error_callback, |
- syncer::ModelType model_type, |
- sync_driver::SyncClient* sync_client) |
- : UIModelTypeController(ui_thread, |
- error_callback, |
- model_type, |
- sync_client) {} |
- |
- private: |
- ~TestUIModelTypeController() override {} |
-}; |
- |
// A no-op instance of CommitQueue. |
class NullCommitQueue : public syncer_v2::CommitQueue { |
public: |
@@ -142,10 +128,10 @@ class UIModelTypeControllerTest : public testing::Test, |
~UIModelTypeControllerTest() override {} |
void SetUp() override { |
- controller_ = new TestUIModelTypeController( |
- ui_loop_.task_runner(), base::Closure(), syncer::DEVICE_INFO, this); |
- service_.reset(new syncer_v2::StubModelTypeService(base::Bind( |
- &UIModelTypeControllerTest::CreateProcessor, base::Unretained(this)))); |
+ controller_ = base::MakeUnique<UIModelTypeController>( |
+ syncer::DEVICE_INFO, base::Closure(), this); |
+ service_ = base::MakeUnique<syncer_v2::StubModelTypeService>(base::Bind( |
+ &UIModelTypeControllerTest::CreateProcessor, base::Unretained(this))); |
} |
void TearDown() override { |
@@ -215,7 +201,7 @@ class UIModelTypeControllerTest : public testing::Test, |
auto_run_tasks_ = auto_run_tasks; |
} |
- void LoadModelsDone(syncer::ModelType type, syncer::SyncError error) { |
+ void LoadModelsDone(syncer::ModelType type, const syncer::SyncError& error) { |
load_models_callback_called_ = true; |
load_models_error_ = error; |
} |
@@ -228,7 +214,7 @@ class UIModelTypeControllerTest : public testing::Test, |
} |
syncer_v2::SharedModelTypeProcessor* type_processor_; |
- scoped_refptr<TestUIModelTypeController> controller_; |
+ std::unique_ptr<UIModelTypeController> controller_; |
bool auto_run_tasks_; |
bool load_models_callback_called_; |