[Sync] Remove UIDataTypeController

chrome/browser/sync/chrome_sync_client.cc

Index: chrome/browser/sync/chrome_sync_client.cc
diff --git a/chrome/browser/sync/chrome_sync_client.cc b/chrome/browser/sync/chrome_sync_client.cc
index 05a808c5e13aac51ad1711391b0d82bd45388c80..52edc1f50239e6cffa523411ec1f014faf361d15 100644
--- a/chrome/browser/sync/chrome_sync_client.cc
+++ b/chrome/browser/sync/chrome_sync_client.cc
@@ -58,9 +58,9 @@
 #include "components/sync/base/report_unrecoverable_error.h"
 #include "components/sync/driver/glue/browser_thread_model_worker.h"
 #include "components/sync/driver/glue/ui_model_worker.h"
+#include "components/sync/driver/non_ui_data_type_controller.h"
 #include "components/sync/driver/sync_api_component_factory.h"
 #include "components/sync/driver/sync_util.h"
-#include "components/sync/driver/ui_data_type_controller.h"
 #include "components/sync/engine/passive_model_worker.h"
 #include "components/sync_preferences/pref_service_syncable.h"
 #include "components/sync_sessions/sync_sessions_client.h"
@@ -116,7 +116,7 @@ using browser_sync::ExtensionDataTypeController;
 using browser_sync::ExtensionSettingDataTypeController;
 #endif
 using browser_sync::SearchEngineDataTypeController;
-using syncer::UIDataTypeController;
+using syncer::NonUIDataTypeController;
 
 namespace browser_sync {
 
@@ -558,7 +558,8 @@ void ChromeSyncClient::RegisterDesktopDataTypes(
   if (!disabled_types.Has(syncer::EXTENSION_SETTINGS)) {
     sync_service->RegisterDataTypeController(
         base::MakeUnique<ExtensionSettingDataTypeController>(
-            syncer::EXTENSION_SETTINGS, error_callback, this, profile_));
+            syncer::EXTENSION_SETTINGS, error_callback, this, profile_,
+            BrowserThread::GetTaskRunnerForThread(BrowserThread::FILE)));

[maxbogue, 2016/11/18 19:31:03]

I think that it runs on the FILE thread is an inherent part of
ExtensionSettingDataTypeController, no? It could just pass it into the
superclass constructor without taking it as a parameter.

[pavely, 2016/11/19 01:11:42]

Done.

   }
 
   // App setting sync is enabled by default.  Register unless explicitly
@@ -566,15 +567,17 @@ void ChromeSyncClient::RegisterDesktopDataTypes(
   if (!disabled_types.Has(syncer::APP_SETTINGS)) {
     sync_service->RegisterDataTypeController(
         base::MakeUnique<ExtensionSettingDataTypeController>(
-            syncer::APP_SETTINGS, error_callback, this, profile_));
+            syncer::APP_SETTINGS, error_callback, this, profile_,
+            BrowserThread::GetTaskRunnerForThread(BrowserThread::FILE)));
   }
 #endif
 
 #if BUILDFLAG(ENABLE_APP_LIST)
   if (app_list::switches::IsAppListSyncEnabled()) {
     sync_service->RegisterDataTypeController(
-        base::MakeUnique<UIDataTypeController>(syncer::APP_LIST, error_callback,
-                                               this));
+        base::MakeUnique<NonUIDataTypeController>(
+            syncer::APP_LIST, error_callback, this, syncer::GROUP_UI,
+            BrowserThread::GetTaskRunnerForThread(BrowserThread::UI)));
   }
 #endif
 
@@ -582,8 +585,9 @@ void ChromeSyncClient::RegisterDesktopDataTypes(
   // Dictionary sync is enabled by default.
   if (!disabled_types.Has(syncer::DICTIONARY)) {
     sync_service->RegisterDataTypeController(
-        base::MakeUnique<UIDataTypeController>(syncer::DICTIONARY,
-                                               error_callback, this));
+        base::MakeUnique<NonUIDataTypeController>(
+            syncer::DICTIONARY, error_callback, this, syncer::GROUP_UI,
+            BrowserThread::GetTaskRunnerForThread(BrowserThread::UI)));
   }
 #endif
 
@@ -608,8 +612,9 @@ void ChromeSyncClient::RegisterDesktopDataTypes(
           switches::kEnableWifiCredentialSync) &&
       !disabled_types.Has(syncer::WIFI_CREDENTIALS)) {
     sync_service->RegisterDataTypeController(
-        base::MakeUnique<UIDataTypeController>(syncer::WIFI_CREDENTIALS,
-                                               error_callback, this));
+        base::MakeUnique<NonUIDataTypeController>(
+            syncer::WIFI_CREDENTIALS, error_callback, this, syncer::GROUP_UI,
+            BrowserThread::GetTaskRunnerForThread(BrowserThread::UI)));
   }
   // TODO(lgcheng): Add switch for this.
   sync_service->RegisterDataTypeController(