[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 00281a541b3d688ad2a5a879e0641c17d34efc8f..fa8b0dba9cae333dde0398eb9ba6946aa66ea08f 100644
--- a/chrome/browser/sync/chrome_sync_client.cc
+++ b/chrome/browser/sync/chrome_sync_client.cc
@@ -56,9 +56,9 @@
 #include "components/signin/core/browser/profile_oauth2_token_service.h"
 #include "components/spellcheck/spellcheck_build_features.h"
 #include "components/sync/base/report_unrecoverable_error.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/browser_thread_model_worker.h"
 #include "components/sync/engine/passive_model_worker.h"
 #include "components/sync/engine/ui_model_worker.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 {
 
@@ -577,8 +577,9 @@ void ChromeSyncClient::RegisterDesktopDataTypes(
 #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
 
@@ -586,8 +587,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
 
@@ -612,8 +614,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(