Sync: Refactoring DataTypeController to make the design shareable with USS datatypes.

components/sync_driver/non_ui_data_type_controller_unittest.cc

Index: components/sync_driver/non_ui_data_type_controller_unittest.cc
diff --git a/components/sync_driver/non_ui_data_type_controller_unittest.cc b/components/sync_driver/non_ui_data_type_controller_unittest.cc
index 6c86ae5671da7f8bc1abb6766f427bf359a5accb..ec10a53153ce70af3bc4315e04fe8b0379c62db8 100644
--- a/components/sync_driver/non_ui_data_type_controller_unittest.cc
+++ b/components/sync_driver/non_ui_data_type_controller_unittest.cc
@@ -17,6 +17,7 @@
 #include "base/threading/thread.h"
 #include "base/tracked_objects.h"
 #include "components/sync_driver/data_type_controller_mock.h"
+#include "components/sync_driver/fake_sync_client.h"
 #include "components/sync_driver/generic_change_processor_factory.h"
 #include "components/sync_driver/non_ui_data_type_controller_mock.h"
 #include "sync/api/fake_syncable_service.h"
@@ -178,7 +179,8 @@ class NonUIDataTypeControllerFake
   scoped_refptr<base::SingleThreadTaskRunner> backend_task_runner_;
 };
 
-class SyncNonUIDataTypeControllerTest : public testing::Test {
+class SyncNonUIDataTypeControllerTest : public testing::Test,
+                                        public FakeSyncClient {
  public:
   SyncNonUIDataTypeControllerTest()
       : backend_thread_("dbthread") {}
@@ -189,7 +191,7 @@ class SyncNonUIDataTypeControllerTest : public testing::Test {
     // All of these are refcounted, so don't need to be released.
     dtc_mock_ = new StrictMock<NonUIDataTypeControllerMock>();
     non_ui_dtc_ = new NonUIDataTypeControllerFake(
-        NULL, dtc_mock_.get(), change_processor_.get(),
+        this, dtc_mock_.get(), change_processor_.get(),
         backend_thread_.task_runner());
   }