[Sync] Remove DeviceInfoModelTypeController.

It is unnecessary; for USS the DTC's are generic and we can just use the
UIModelTypeController.

BUG=

Review-Url: https://codereview.chromium.org/2017963002
Cr-Commit-Position: refs/heads/master@{#396900}

components/browser_sync/browser/profile_sync_components_factory_impl.cc

@@ -29,7 +29,6 @@
 #include "components/sync_bookmarks/bookmark_model_associator.h"
 #include "components/sync_driver/data_type_manager_impl.h"
 #include "components/sync_driver/device_info_data_type_controller.h"
-#include "components/sync_driver/device_info_model_type_controller.h"
 #include "components/sync_driver/glue/chrome_report_unrecoverable_error.h"
 #include "components/sync_driver/glue/sync_backend_host.h"
 #include "components/sync_driver/glue/sync_backend_host_impl.h"
@@ -38,6 +37,7 @@
 #include "components/sync_driver/sync_client.h"
 #include "components/sync_driver/sync_driver_switches.h"
 #include "components/sync_driver/ui_data_type_controller.h"
+#include "components/sync_driver/ui_model_type_controller.h"
 #include "components/sync_sessions/session_data_type_controller.h"
 #include "google_apis/gaia/oauth2_token_service.h"
 #include "google_apis/gaia/oauth2_token_service_request.h"
@@ -67,7 +67,7 @@ using sync_driver::DataTypeManagerObserver;
 using sync_driver::DeviceInfoDataTypeController;
 using sync_driver::ProxyDataTypeController;
 using sync_driver::UIDataTypeController;
-using sync_driver_v2::DeviceInfoModelTypeController;
+using sync_driver_v2::UIModelTypeController;
 
 namespace {
 
@@ -145,8 +145,8 @@ void ProfileSyncComponentsFactoryImpl::RegisterCommonDataTypes(
   // TODO(stanisc): can DEVICE_INFO be one of disabled datatypes?
   if (channel_ == version_info::Channel::UNKNOWN &&
       command_line_.HasSwitch(switches::kSyncEnableUSSDeviceInfo)) {
-    sync_service->RegisterDataTypeController(new DeviceInfoModelTypeController(
-        ui_thread_, error_callback, sync_client_));
+    sync_service->RegisterDataTypeController(new UIModelTypeController(
+        ui_thread_, error_callback, syncer::DEVICE_INFO, sync_client_));
   } else {
     sync_service->RegisterDataTypeController(new DeviceInfoDataTypeController(
         ui_thread_, error_callback, sync_client_,

components/sync_driver.gypi

@@ -55,8 +55,6 @@
         'sync_driver/device_info.h',
         'sync_driver/device_info_data_type_controller.cc',
         'sync_driver/device_info_data_type_controller.h',
-        'sync_driver/device_info_model_type_controller.cc',
-        'sync_driver/device_info_model_type_controller.h',
         'sync_driver/device_info_service.cc',
         'sync_driver/device_info_service.h',
         'sync_driver/device_info_sync_service.cc',

components/sync_driver/BUILD.gn

@@ -32,8 +32,6 @@ source_set("sync_driver") {
     "device_info.h",
     "device_info_data_type_controller.cc",
     "device_info_data_type_controller.h",
-    "device_info_model_type_controller.cc",
-    "device_info_model_type_controller.h",
     "device_info_service.cc",
     "device_info_service.h",
     "device_info_sync_service.cc",

components/sync_driver/device_info_model_type_controller.cc

-// Copyright 2016 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include "components/sync_driver/device_info_model_type_controller.h"
-
-#include "components/sync_driver/sync_client.h"
-#include "sync/api/model_type_service.h"
-#include "sync/internal_api/public/base/model_type.h"
-
-namespace sync_driver_v2 {
-
-using sync_driver::LocalDeviceInfoProvider;
-using sync_driver::SyncClient;
-
-DeviceInfoModelTypeController::DeviceInfoModelTypeController(
-    const scoped_refptr<base::SingleThreadTaskRunner>& ui_thread,
-    const base::Closure& error_callback,
-    SyncClient* sync_client)
-    : UIModelTypeController(ui_thread,
-                            error_callback,
-                            syncer::DEVICE_INFO,
-                            sync_client) {}
-
-DeviceInfoModelTypeController::~DeviceInfoModelTypeController() {}
-
-}  // namespace sync_driver_v2

components/sync_driver/device_info_model_type_controller.h

-// Copyright 2016 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#ifndef COMPONENTS_SYNC_DRIVER_DEVICE_INFO_MODEL_TYPE_CONTROLLER_H_
-#define COMPONENTS_SYNC_DRIVER_DEVICE_INFO_MODEL_TYPE_CONTROLLER_H_
-
-#include <memory>
-
-#include "components/sync_driver/local_device_info_provider.h"
-#include "components/sync_driver/ui_model_type_controller.h"
-
-namespace sync_driver {
-class SyncClient;
-}
-
-namespace sync_driver_v2 {
-
-// DataTypeController for DEVICE_INFO model type.
-class DeviceInfoModelTypeController : public UIModelTypeController {
- public:
-  DeviceInfoModelTypeController(
-      const scoped_refptr<base::SingleThreadTaskRunner>& ui_thread,
-      const base::Closure& error_callback,
-      sync_driver::SyncClient* sync_client);
-
- private:
-  ~DeviceInfoModelTypeController() override;
-
-  std::unique_ptr<sync_driver::LocalDeviceInfoProvider::Subscription>
-      subscription_;
-  DISALLOW_COPY_AND_ASSIGN(DeviceInfoModelTypeController);
-};
-
-}  // namespace sync_driver_v2
-
-#endif  // COMPONENTS_SYNC_DRIVER_DEVICE_INFO_MODEL_TYPE_CONTROLLER_H_