[Sync] Convert DTCs to be not RefCounted and NonThreadSafe.

components/search_engines/search_engine_data_type_controller_unittest.cc

Index: components/search_engines/search_engine_data_type_controller_unittest.cc
diff --git a/components/search_engines/search_engine_data_type_controller_unittest.cc b/components/search_engines/search_engine_data_type_controller_unittest.cc
index 98d6914d885f80492732aa390f8be2a9f0835a6c..00e479d111859a51df80f98b0940a88305f902a2 100644
--- a/components/search_engines/search_engine_data_type_controller_unittest.cc
+++ b/components/search_engines/search_engine_data_type_controller_unittest.cc
@@ -10,6 +10,7 @@
 #include "base/bind_helpers.h"
 #include "base/callback.h"
 #include "base/memory/ptr_util.h"
+#include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
 #include "base/single_thread_task_runner.h"
 #include "base/threading/thread_task_runner_handle.h"
@@ -37,10 +38,11 @@ class SyncSearchEngineDataTypeControllerTest
  public:
   SyncSearchEngineDataTypeControllerTest()
       : sync_driver::FakeSyncClient(&profile_sync_factory_),
-        template_url_service_(new TemplateURLService(nullptr, 0)) {
+        template_url_service_(nullptr, 0),
+        search_engine_dtc_(base::Closure(), this, &template_url_service_) {
     // Disallow the TemplateURLService from loading until
     // PreloadTemplateURLService() is called .
-    template_url_service_->set_disable_load(true);
+    template_url_service_.set_disable_load(true);
   }
 
   // FakeSyncClient overrides.
@@ -49,27 +51,19 @@ class SyncSearchEngineDataTypeControllerTest
     return syncable_service_.AsWeakPtr();
   }
 
-  void SetUp() override {
-    search_engine_dtc_ = new SearchEngineDataTypeController(
-        base::ThreadTaskRunnerHandle::Get(),
-        base::Bind(&base::DoNothing), this,
-        template_url_service_.get());
-  }
-
   void TearDown() override {
     // Must be done before we pump the loop.
     syncable_service_.StopSyncing(syncer::SEARCH_ENGINES);
-    search_engine_dtc_ = NULL;
   }
 
  protected:
   void PreloadTemplateURLService() {
-    template_url_service_->set_disable_load(false);
-    template_url_service_->Load();
+    template_url_service_.set_disable_load(false);
+    template_url_service_.Load();
   }
 
   void SetStartExpectations() {
-    search_engine_dtc_->SetGenericChangeProcessorFactoryForTest(
+    search_engine_dtc_.SetGenericChangeProcessorFactoryForTest(
         base::WrapUnique<sync_driver::GenericChangeProcessorFactory>(
             new sync_driver::FakeGenericChangeProcessorFactory(
                 base::MakeUnique<sync_driver::FakeGenericChangeProcessor>(
@@ -78,18 +72,18 @@ class SyncSearchEngineDataTypeControllerTest
   }
 
   void Start() {
-    search_engine_dtc_->LoadModels(
+    search_engine_dtc_.LoadModels(
         base::Bind(&sync_driver::ModelLoadCallbackMock::Run,
                    base::Unretained(&model_load_callback_)));
-    search_engine_dtc_->StartAssociating(
+    search_engine_dtc_.StartAssociating(
         base::Bind(&sync_driver::StartCallbackMock::Run,
                    base::Unretained(&start_callback_)));
     base::RunLoop().RunUntilIdle();
   }
 
   base::MessageLoop message_loop_;
-  std::unique_ptr<TemplateURLService> template_url_service_;
-  scoped_refptr<SearchEngineDataTypeController> search_engine_dtc_;
+  TemplateURLService template_url_service_;
+  SearchEngineDataTypeController search_engine_dtc_;
   SyncApiComponentFactoryMock profile_sync_factory_;
   syncer::FakeSyncableService syncable_service_;
   sync_driver::StartCallbackMock start_callback_;
@@ -103,30 +97,30 @@ TEST_F(SyncSearchEngineDataTypeControllerTest, StartURLServiceReady) {
   EXPECT_CALL(start_callback_, Run(sync_driver::DataTypeController::OK, _, _));
 
   EXPECT_EQ(sync_driver::DataTypeController::NOT_RUNNING,
-            search_engine_dtc_->state());
+            search_engine_dtc_.state());
   EXPECT_FALSE(syncable_service_.syncing());
   Start();
   EXPECT_EQ(sync_driver::DataTypeController::RUNNING,
-            search_engine_dtc_->state());
+            search_engine_dtc_.state());
   EXPECT_TRUE(syncable_service_.syncing());
 }
 
 TEST_F(SyncSearchEngineDataTypeControllerTest, StartURLServiceNotReady) {
   EXPECT_CALL(model_load_callback_, Run(_, _));
   EXPECT_FALSE(syncable_service_.syncing());
-  search_engine_dtc_->LoadModels(
+  search_engine_dtc_.LoadModels(
       base::Bind(&sync_driver::ModelLoadCallbackMock::Run,
                  base::Unretained(&model_load_callback_)));
-  EXPECT_TRUE(search_engine_dtc_->GetSubscriptionForTesting());
+  EXPECT_TRUE(search_engine_dtc_.GetSubscriptionForTesting());
   EXPECT_EQ(sync_driver::DataTypeController::MODEL_STARTING,
-            search_engine_dtc_->state());
+            search_engine_dtc_.state());
   EXPECT_FALSE(syncable_service_.syncing());
 
   // Send the notification that the TemplateURLService has started.
   PreloadTemplateURLService();
-  EXPECT_EQ(NULL, search_engine_dtc_->GetSubscriptionForTesting());
+  EXPECT_EQ(NULL, search_engine_dtc_.GetSubscriptionForTesting());
   EXPECT_EQ(sync_driver::DataTypeController::MODEL_LOADED,
-            search_engine_dtc_->state());
+            search_engine_dtc_.state());
 
   // Wait until WebDB is loaded before we shut it down.
   base::RunLoop().RunUntilIdle();
@@ -145,11 +139,11 @@ TEST_F(SyncSearchEngineDataTypeControllerTest, StartAssociationFailed) {
 
   Start();
   EXPECT_EQ(sync_driver::DataTypeController::DISABLED,
-            search_engine_dtc_->state());
+            search_engine_dtc_.state());
   EXPECT_FALSE(syncable_service_.syncing());
-  search_engine_dtc_->Stop();
+  search_engine_dtc_.Stop();
   EXPECT_EQ(sync_driver::DataTypeController::NOT_RUNNING,
-            search_engine_dtc_->state());
+            search_engine_dtc_.state());
   EXPECT_FALSE(syncable_service_.syncing());
 }
 
@@ -159,31 +153,31 @@ TEST_F(SyncSearchEngineDataTypeControllerTest, Stop) {
   EXPECT_CALL(start_callback_, Run(sync_driver::DataTypeController::OK, _, _));
 
   EXPECT_EQ(sync_driver::DataTypeController::NOT_RUNNING,
-            search_engine_dtc_->state());
+            search_engine_dtc_.state());
   EXPECT_FALSE(syncable_service_.syncing());
   Start();
   EXPECT_EQ(sync_driver::DataTypeController::RUNNING,
-            search_engine_dtc_->state());
+            search_engine_dtc_.state());
   EXPECT_TRUE(syncable_service_.syncing());
-  search_engine_dtc_->Stop();
+  search_engine_dtc_.Stop();
   EXPECT_EQ(sync_driver::DataTypeController::NOT_RUNNING,
-            search_engine_dtc_->state());
+            search_engine_dtc_.state());
   EXPECT_FALSE(syncable_service_.syncing());
 }
 
 TEST_F(SyncSearchEngineDataTypeControllerTest, StopBeforeLoaded) {
   EXPECT_FALSE(syncable_service_.syncing());
-  search_engine_dtc_->LoadModels(
+  search_engine_dtc_.LoadModels(
       base::Bind(&sync_driver::ModelLoadCallbackMock::Run,
                  base::Unretained(&model_load_callback_)));
-  EXPECT_TRUE(search_engine_dtc_->GetSubscriptionForTesting());
+  EXPECT_TRUE(search_engine_dtc_.GetSubscriptionForTesting());
   EXPECT_EQ(sync_driver::DataTypeController::MODEL_STARTING,
-            search_engine_dtc_->state());
+            search_engine_dtc_.state());
   EXPECT_FALSE(syncable_service_.syncing());
-  search_engine_dtc_->Stop();
-  EXPECT_EQ(NULL, search_engine_dtc_->GetSubscriptionForTesting());
+  search_engine_dtc_.Stop();
+  EXPECT_EQ(NULL, search_engine_dtc_.GetSubscriptionForTesting());
   EXPECT_EQ(sync_driver::DataTypeController::NOT_RUNNING,
-            search_engine_dtc_->state());
+            search_engine_dtc_.state());
   EXPECT_FALSE(syncable_service_.syncing());
 }