[NOT FOR REVIEW] Copy of Max's CL with conflicts fixed

components/sync_driver/BUILD.gn

 # Copyright 2014 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.
 
 import("//build/config/features.gni")
 
 source_set("sync_driver") {
   sources = [
     "about_sync_util.cc",
     "about_sync_util.h",
@@ skipping 31 matching lines @@
     "frontend_data_type_controller.cc",
     "frontend_data_type_controller.h",
     "generic_change_processor.cc",
     "generic_change_processor.h",
     "generic_change_processor_factory.cc",
     "generic_change_processor_factory.h",
     "glue/browser_thread_model_worker.cc",
     "glue/browser_thread_model_worker.h",
     "glue/chrome_report_unrecoverable_error.cc",
     "glue/chrome_report_unrecoverable_error.h",
+    "glue/sync_backend_host.cc",
+    "glue/sync_backend_host.h",
+    "glue/sync_backend_host_core.cc",
+    "glue/sync_backend_host_core.h",
+    "glue/sync_backend_host_impl.cc",
+    "glue/sync_backend_host_impl.h",
     "glue/sync_backend_registrar.cc",
     "glue/sync_backend_registrar.h",
     "glue/synced_session.cc",
     "glue/synced_session.h",
     "glue/synced_window_delegate.h",
     "glue/ui_model_worker.cc",
     "glue/ui_model_worker.h",
     "invalidation_adapter.cc",
     "invalidation_adapter.h",
     "invalidation_helper.cc",
@@ skipping 57 matching lines @@
     "tab_node_pool.h",
     "ui_data_type_controller.cc",
     "ui_data_type_controller.h",
     "user_selectable_sync_type.h",
   ]
 
   deps = [
     "//base",
     "//base:prefs",
     "//base/third_party/dynamic_annotations",
+    "//components/data_use_measurement/core",
     "//components/invalidation/public",
     "//components/os_crypt",
     "//components/pref_registry",
     "//components/sessions",
     "//components/signin/core/browser",
     "//components/version_info",
     "//google_apis",
     "//net",
     "//sync",
     "//third_party/cacheinvalidation",
@@ skipping 26 matching lines @@
     "fake_data_type_controller.cc",
     "fake_data_type_controller.h",
     "fake_generic_change_processor.cc",
     "fake_generic_change_processor.h",
     "fake_sync_client.cc",
     "fake_sync_client.h",
     "fake_sync_service.cc",
     "fake_sync_service.h",
     "frontend_data_type_controller_mock.cc",
     "frontend_data_type_controller_mock.h",
+    "glue/sync_backend_host_mock.cc",
+    "glue/sync_backend_host_mock.h",
     "local_device_info_provider_mock.cc",
     "local_device_info_provider_mock.h",
     "model_associator_mock.cc",
     "model_associator_mock.h",
     "non_frontend_data_type_controller_mock.cc",
     "non_frontend_data_type_controller_mock.h",
     "non_ui_data_type_controller_mock.cc",
     "non_ui_data_type_controller_mock.h",
     "sync_api_component_factory_mock.cc",
     "sync_api_component_factory_mock.h",
@@ skipping 61 matching lines @@
   ]
 
   if (enable_configuration_policy) {
     sources += [ "sync_policy_handler_unittest.cc" ]
     deps += [
       "//components/policy",
       "//components/policy:policy_component",
     ]
   }
 }