Device info datatype should be moved to components/sync_driver.

chrome/chrome_browser.gypi

Index: chrome/chrome_browser.gypi
diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi
index 58082c5936cdec93f8f29ca68c96a485f80263ef..0882397a7ef8139d0011ae81e2c6448b912f2460 100644
--- a/chrome/chrome_browser.gypi
+++ b/chrome/chrome_browser.gypi
@@ -767,7 +767,7 @@
       'browser/net/quota_policy_channel_id_store.h',
       'browser/net/referrer.cc',
       'browser/net/referrer.h',
-      'browser/net/resource_prefetch_predictor_observer.cc',  
+      'browser/net/resource_prefetch_predictor_observer.cc',
       'browser/net/resource_prefetch_predictor_observer.h',
       'browser/net/safe_search_util.cc',
       'browser/net/safe_search_util.h',
@@ -840,19 +840,19 @@
       'browser/predictors/predictor_database_factory.h',
       'browser/predictors/predictor_table_base.cc',
       'browser/predictors/predictor_table_base.h',
-      'browser/predictors/resource_prefetch_common.cc', 
-      'browser/predictors/resource_prefetch_common.h',  
-      'browser/predictors/resource_prefetch_predictor.cc',  
-      'browser/predictors/resource_prefetch_predictor.h', 
-      'browser/predictors/resource_prefetch_predictor_factory.cc',  
-      'browser/predictors/resource_prefetch_predictor_factory.h', 
-      'browser/predictors/resource_prefetch_predictor_tab_helper.cc', 
-      'browser/predictors/resource_prefetch_predictor_tab_helper.h',  
-      'browser/predictors/resource_prefetch_predictor_tables.cc', 
-      'browser/predictors/resource_prefetch_predictor_tables.h',  
-      'browser/predictors/resource_prefetcher.cc',  
-      'browser/predictors/resource_prefetcher.h', 
-      'browser/predictors/resource_prefetcher_manager.cc',  
+      'browser/predictors/resource_prefetch_common.cc',
+      'browser/predictors/resource_prefetch_common.h',
+      'browser/predictors/resource_prefetch_predictor.cc',
+      'browser/predictors/resource_prefetch_predictor.h',
+      'browser/predictors/resource_prefetch_predictor_factory.cc',
+      'browser/predictors/resource_prefetch_predictor_factory.h',
+      'browser/predictors/resource_prefetch_predictor_tab_helper.cc',
+      'browser/predictors/resource_prefetch_predictor_tab_helper.h',
+      'browser/predictors/resource_prefetch_predictor_tables.cc',
+      'browser/predictors/resource_prefetch_predictor_tables.h',
+      'browser/predictors/resource_prefetcher.cc',
+      'browser/predictors/resource_prefetcher.h',
+      'browser/predictors/resource_prefetcher_manager.cc',
       'browser/predictors/resource_prefetcher_manager.h',
       'browser/pref_service_flags_storage.cc',
       'browser/pref_service_flags_storage.h',
@@ -1221,13 +1221,6 @@
       'browser/sync/glue/browser_thread_model_worker.h',
       'browser/sync/glue/chrome_report_unrecoverable_error.cc',
       'browser/sync/glue/chrome_report_unrecoverable_error.h',
-      'browser/sync/glue/device_info.cc',
-      'browser/sync/glue/device_info.h',
-      'browser/sync/glue/device_info_data_type_controller.cc',
-      'browser/sync/glue/device_info_data_type_controller.h',
-      'browser/sync/glue/device_info_sync_service.cc',
-      'browser/sync/glue/device_info_sync_service.h',
-      'browser/sync/glue/device_info_tracker.h',
       'browser/sync/glue/extensions_activity_monitor.cc',
       'browser/sync/glue/extensions_activity_monitor.h',
       'browser/sync/glue/favicon_cache.cc',
@@ -1242,7 +1235,6 @@
       'browser/sync/glue/invalidation_adapter.h',
       'browser/sync/glue/invalidation_helper.cc',
       'browser/sync/glue/invalidation_helper.h',
-      'browser/sync/glue/local_device_info_provider.h',
       'browser/sync/glue/local_device_info_provider_impl.cc',
       'browser/sync/glue/local_device_info_provider_impl.h',
       'browser/sync/glue/non_frontend_data_type_controller.cc',