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

components/sync_driver/frontend_data_type_controller.cc

Index: components/sync_driver/frontend_data_type_controller.cc
diff --git a/components/sync_driver/frontend_data_type_controller.cc b/components/sync_driver/frontend_data_type_controller.cc
index 5fe0a865e08b66b1f692bd695c2611b6f1568c6d..c2bbe0eb6aab24dda63ce8447b7f1d6102b9d623 100644
--- a/components/sync_driver/frontend_data_type_controller.cc
+++ b/components/sync_driver/frontend_data_type_controller.cc
@@ -11,6 +11,7 @@
 #include "components/sync_driver/sync_client.h"
 #include "components/sync_driver/sync_service.h"
 #include "sync/api/sync_error.h"
+#include "sync/api/sync_merge_result.h"
 #include "sync/internal_api/public/base/model_type.h"
 #include "sync/util/data_type_histogram.h"
 
@@ -20,7 +21,7 @@ FrontendDataTypeController::FrontendDataTypeController(
     scoped_refptr<base::SingleThreadTaskRunner> ui_thread,
     const base::Closure& error_callback,
     sync_driver::SyncClient* sync_client)
-    : DataTypeController(ui_thread, error_callback),
+    : DirectoryDataTypeController(ui_thread, error_callback),
       sync_client_(sync_client),
       state_(NOT_RUNNING) {
   DCHECK(thread_checker_.CalledOnValidThread());
@@ -136,10 +137,10 @@ void FrontendDataTypeController::OnSingleDataTypeUnrecoverableError(
 }
 
 FrontendDataTypeController::FrontendDataTypeController()
-    : DataTypeController(base::ThreadTaskRunnerHandle::Get(), base::Closure()),
+    : DirectoryDataTypeController(base::ThreadTaskRunnerHandle::Get(),
+                                  base::Closure()),
       sync_client_(NULL),
-      state_(NOT_RUNNING) {
-}
+      state_(NOT_RUNNING) {}
 
 FrontendDataTypeController::~FrontendDataTypeController() {
   DCHECK(thread_checker_.CalledOnValidThread());