[Sync] Move //components/sync_driver to //components/sync/driver.

components/components_tests.gyp

Index: components/components_tests.gyp
diff --git a/components/components_tests.gyp b/components/components_tests.gyp
index 018e7d7a7478099470463644656e996ad9a82538..44c7672a84fe7375a74dc45d42650c98a80b3fb2 100644
--- a/components/components_tests.gyp
+++ b/components/components_tests.gyp
@@ -821,6 +821,34 @@
       'sync/api/sync_data_unittest.cc',
       'sync/api/sync_error_unittest.cc',
       'sync/api/sync_merge_result_unittest.cc',
+      'sync/driver/about_sync_util_unittest.cc',
+      'sync/driver/backend_migrator_unittest.cc',
+      'sync/driver/data_type_manager_impl_unittest.cc',
+      'sync/driver/device_count_metrics_provider_unittest.cc',
+      'sync/driver/device_info_data_type_controller_unittest.cc',
+      'sync/driver/device_info_service_unittest.cc',
+      'sync/driver/device_info_sync_service_unittest.cc',
+      'sync/driver/device_info_util_unittest.cc',
+      'sync/driver/frontend_data_type_controller_unittest.cc',
+      'sync/driver/generic_change_processor_unittest.cc',
+      'sync/driver/glue/browser_thread_model_worker_unittest.cc',
+      'sync/driver/glue/sync_backend_host_impl_unittest.cc',
+      'sync/driver/glue/sync_backend_registrar_unittest.cc',
+      'sync/driver/glue/ui_model_worker_unittest.cc',
+      'sync/driver/local_device_info_provider_unittest.cc',
+      'sync/driver/model_association_manager_unittest.cc',
+      'sync/driver/non_blocking_data_type_controller_unittest.cc',
+      'sync/driver/non_ui_data_type_controller_unittest.cc',
+      'sync/driver/non_ui_model_type_controller_unittest.cc',
+      'sync/driver/profile_sync_auth_provider_unittest.cc',
+      'sync/driver/shared_change_processor_unittest.cc',
+      'sync/driver/startup_controller_unittest.cc',
+      'sync/driver/sync_prefs_unittest.cc',
+      'sync/driver/sync_stopped_reporter_unittest.cc',
+      'sync/driver/sync_util_unittest.cc',
+      'sync/driver/system_encryptor_unittest.cc',
+      'sync/driver/ui_data_type_controller_unittest.cc',
+      'sync/driver/ui_model_type_controller_unittest.cc',
       'sync/engine_impl/apply_control_data_updates_unittest.cc',
       'sync/engine_impl/backoff_delay_provider_unittest.cc',
       'sync/engine_impl/directory_commit_contribution_unittest.cc',
@@ -898,36 +926,6 @@
     'sync_bookmarks_unittest_sources': [
       'sync_bookmarks/bookmark_data_type_controller_unittest.cc',
     ],
-    'sync_driver_unittest_sources': [
-      'sync_driver/about_sync_util_unittest.cc',
-      'sync_driver/backend_migrator_unittest.cc',
-      'sync_driver/data_type_manager_impl_unittest.cc',
-      'sync_driver/device_count_metrics_provider_unittest.cc',
-      'sync_driver/device_info_data_type_controller_unittest.cc',
-      'sync_driver/device_info_service_unittest.cc',
-      'sync_driver/device_info_sync_service_unittest.cc',
-      'sync_driver/device_info_util_unittest.cc',
-      'sync_driver/frontend_data_type_controller_unittest.cc',
-      'sync_driver/generic_change_processor_unittest.cc',
-      'sync_driver/glue/browser_thread_model_worker_unittest.cc',
-      'sync_driver/glue/sync_backend_host_impl_unittest.cc',
-      'sync_driver/glue/sync_backend_registrar_unittest.cc',
-      'sync_driver/glue/ui_model_worker_unittest.cc',
-      'sync_driver/local_device_info_provider_unittest.cc',
-      'sync_driver/model_association_manager_unittest.cc',
-      'sync_driver/non_blocking_data_type_controller_unittest.cc',
-      'sync_driver/non_ui_data_type_controller_unittest.cc',
-      'sync_driver/non_ui_model_type_controller_unittest.cc',
-      'sync_driver/profile_sync_auth_provider_unittest.cc',
-      'sync_driver/shared_change_processor_unittest.cc',
-      'sync_driver/startup_controller_unittest.cc',
-      'sync_driver/sync_prefs_unittest.cc',
-      'sync_driver/sync_stopped_reporter_unittest.cc',
-      'sync_driver/sync_util_unittest.cc',
-      'sync_driver/system_encryptor_unittest.cc',
-      'sync_driver/ui_data_type_controller_unittest.cc',
-      'sync_driver/ui_model_type_controller_unittest.cc',
-    ],
     'sync_sessions_unittest_sources': [
       'sync_sessions/favicon_cache_unittest.cc',
       'sync_sessions/revisit/bookmarks_page_revisit_observer_unittest.cc',
@@ -1167,7 +1165,6 @@
         '<@(supervised_user_error_page_unittest_sources)',
         '<@(sync_unittest_sources)',
         '<@(sync_bookmarks_unittest_sources)',
-        '<@(sync_driver_unittest_sources)',
         '<@(sync_sessions_unittest_sources)',
         '<@(syncable_prefs_unittest_sources)',
         '<@(translate_unittest_sources)',
@@ -1309,8 +1306,6 @@
         'components.gyp:suggestions',
         'components.gyp:supervised_user_error_page',
         'components.gyp:sync_bookmarks',
-        'components.gyp:sync_driver',
-        'components.gyp:sync_driver_test_support',
         'components.gyp:sync_sessions',
         'components.gyp:sync_sessions_test_support',
         'components.gyp:syncable_prefs_test_support',
@@ -1343,6 +1338,7 @@
         'sync.gyp:test_support_sync_api',
         'sync.gyp:test_support_sync_core',
         'sync.gyp:test_support_sync_core_impl',
+        'sync.gyp:test_support_sync_driver',
         'url_formatter/url_formatter.gyp:url_formatter',
       ],
       'conditions': [
@@ -1731,7 +1727,7 @@
           ],
           'sources': [
             '<@(policy_unittest_sources)',
-            'sync_driver/sync_policy_handler_unittest.cc',
+            'sync/driver/sync_policy_handler_unittest.cc',
           ],
           'conditions': [
             ['OS=="android"', {
@@ -1773,7 +1769,7 @@
         }, {  # configuration_policy!=1
           'sources!': [
             'search_engines/default_search_policy_handler_unittest.cc',
-            'sync_driver/sync_policy_handler_unittest.cc',
+            'sync/driver/sync_policy_handler_unittest.cc',
           ],
         }],
         ['enable_plugins == 1', {