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

components/sync_driver.gypi

 # 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.
 
 {
   'targets': [
     {
       # GN version: //components/sync_driver
       'target_name': 'sync_driver',
       'type': 'static_library',
       'dependencies': [
         '../base/base.gyp:base',
         '../net/net.gyp:net',
         '../sync/sync.gyp:sync',
         '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidation',
         '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidation_proto_cpp',
         '../ui/gfx/gfx.gyp:gfx',
+        'data_use_measurement_core',
         'invalidation_public',
         'os_crypt',
         'signin_core_browser',
         'version_info',
       ],
       'include_dirs': [
         '..',
       ],
       'sources': [
         # Note: file list duplicated in GN build.
@@ skipping 33 matching lines @@
         'sync_driver/frontend_data_type_controller.cc',
         'sync_driver/frontend_data_type_controller.h',
         'sync_driver/generic_change_processor.cc',
         'sync_driver/generic_change_processor.h',
         'sync_driver/generic_change_processor_factory.cc',
         'sync_driver/generic_change_processor_factory.h',
         'sync_driver/glue/browser_thread_model_worker.cc',
         'sync_driver/glue/browser_thread_model_worker.h',
         'sync_driver/glue/chrome_report_unrecoverable_error.cc',
         'sync_driver/glue/chrome_report_unrecoverable_error.h',
+        'sync_driver/glue/sync_backend_host.cc',
+        'sync_driver/glue/sync_backend_host.h',
+        'sync_driver/glue/sync_backend_host_core.cc',
+        'sync_driver/glue/sync_backend_host_core.h',
+        'sync_driver/glue/sync_backend_host_impl.cc',
+        'sync_driver/glue/sync_backend_host_impl.h',
         'sync_driver/glue/sync_backend_registrar.cc',
         'sync_driver/glue/sync_backend_registrar.h',
         'sync_driver/glue/synced_session.cc',
         'sync_driver/glue/synced_session.h',
         'sync_driver/glue/synced_window_delegate.h',
         'sync_driver/glue/ui_model_worker.cc',
         'sync_driver/glue/ui_model_worker.h',
         'sync_driver/invalidation_adapter.cc',
         'sync_driver/invalidation_adapter.h',
         'sync_driver/invalidation_helper.cc',
@@ skipping 108 matching lines @@
         'sync_driver/fake_data_type_controller.cc',
         'sync_driver/fake_data_type_controller.h',
         'sync_driver/fake_generic_change_processor.cc',
         'sync_driver/fake_generic_change_processor.h',
         'sync_driver/fake_sync_client.cc',
         'sync_driver/fake_sync_client.h',
         'sync_driver/fake_sync_service.cc',
         'sync_driver/fake_sync_service.h',
         'sync_driver/frontend_data_type_controller_mock.cc',
         'sync_driver/frontend_data_type_controller_mock.h',
+        'sync_driver/glue/sync_backend_host_mock.cc',
+        'sync_driver/glue/sync_backend_host_mock.h',
         'sync_driver/local_device_info_provider_mock.cc',
         'sync_driver/local_device_info_provider_mock.h',
         'sync_driver/model_associator_mock.cc',
         'sync_driver/model_associator_mock.h',
         'sync_driver/non_frontend_data_type_controller_mock.cc',
         'sync_driver/non_frontend_data_type_controller_mock.h',
         'sync_driver/non_ui_data_type_controller_mock.cc',
         'sync_driver/non_ui_data_type_controller_mock.h',
         'sync_driver/sync_api_component_factory_mock.cc',
         'sync_driver/sync_api_component_factory_mock.h',
       ],
     },
   ],
 }