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

components/sync_driver/fake_data_type_controller.cc

Index: components/sync_driver/fake_data_type_controller.cc
diff --git a/components/sync_driver/fake_data_type_controller.cc b/components/sync_driver/fake_data_type_controller.cc
index 093dba92a3eeba487179fe452b229ce010a1e994..f4a3499fcf4c8769f3ea7293d0a0605d85233605 100644
--- a/components/sync_driver/fake_data_type_controller.cc
+++ b/components/sync_driver/fake_data_type_controller.cc
@@ -5,6 +5,7 @@
 #include "components/sync_driver/fake_data_type_controller.h"
 
 #include "base/thread_task_runner_handle.h"
+#include "sync/api/sync_merge_result.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
@@ -13,12 +14,12 @@ using syncer::ModelType;
 namespace sync_driver {
 
 FakeDataTypeController::FakeDataTypeController(ModelType type)
-      : DataTypeController(base::ThreadTaskRunnerHandle::Get(),
-        base::Closure()),
-        state_(NOT_RUNNING),
-        model_load_delayed_(false),
-        type_(type),
-        ready_for_start_(true) {}
+    : DirectoryDataTypeController(base::ThreadTaskRunnerHandle::Get(),
+                                  base::Closure()),
+      state_(NOT_RUNNING),
+      model_load_delayed_(false),
+      type_(type),
+      ready_for_start_(true) {}
 
 FakeDataTypeController::~FakeDataTypeController() {
 }