[Sync] Clean up intra-sync DEPS significantly.

components/sync/BUILD.gn

Index: components/sync/BUILD.gn
diff --git a/components/sync/BUILD.gn b/components/sync/BUILD.gn
index 39d42ebd40372645eb8c6a158aeb8e048cff09c4..e24d13ad0fc54d6f34369c34b4bbfd4c33c9b17a 100644
--- a/components/sync/BUILD.gn
+++ b/components/sync/BUILD.gn
@@ -92,8 +92,6 @@ static_library("sync") {
     "base/proto_value_ptr.h",
     "base/stop_source.h",
     "base/sync_db_util.h",
-    "base/sync_string_conversions.cc",
-    "base/sync_string_conversions.h",
     "base/syncer_error.cc",
     "base/syncer_error.h",
     "base/time.cc",
@@ -332,6 +330,8 @@ static_library("sync") {
     "driver/ui_model_type_controller.cc",
     "driver/ui_model_type_controller.h",
     "driver/user_selectable_sync_type.h",
+    "engine/commit_queue.cc",
+    "engine/commit_queue.h",
     "engine/events/clear_server_data_request_event.cc",
     "engine/events/clear_server_data_request_event.h",
     "engine/events/clear_server_data_response_event.cc",
@@ -358,6 +358,8 @@ static_library("sync") {
     "engine/polling_constants.h",
     "engine/sync_status.cc",
     "engine/sync_status.h",
+    "engine/sync_string_conversions.cc",
+    "engine/sync_string_conversions.h",
     "engine_impl/all_status.cc",
     "engine_impl/all_status.h",
     "engine_impl/apply_control_data_updates.cc",
@@ -374,8 +376,6 @@ static_library("sync") {
     "engine_impl/commit_contributor.h",
     "engine_impl/commit_processor.cc",
     "engine_impl/commit_processor.h",
-    "engine_impl/commit_queue.cc",
-    "engine_impl/commit_queue.h",
     "engine_impl/commit_util.cc",
     "engine_impl/commit_util.h",
     "engine_impl/conflict_resolver.cc",
@@ -394,6 +394,8 @@ static_library("sync") {
     "engine_impl/get_updates_delegate.h",
     "engine_impl/get_updates_processor.cc",
     "engine_impl/get_updates_processor.h",
+    "engine_impl/model_type_registry.cc",
+    "engine_impl/model_type_registry.h",
     "engine_impl/model_type_worker.cc",
     "engine_impl/model_type_worker.h",
     "engine_impl/net/server_connection_manager.cc",
@@ -461,8 +463,6 @@ static_library("sync") {
     "sessions_impl/debug_info_getter.h",
     "sessions_impl/directory_type_debug_info_emitter.cc",
     "sessions_impl/directory_type_debug_info_emitter.h",
-    "sessions_impl/model_type_registry.cc",
-    "sessions_impl/model_type_registry.h",
     "sessions_impl/nudge_tracker.cc",
     "sessions_impl/nudge_tracker.h",
     "sessions_impl/status_controller.cc",
@@ -599,6 +599,8 @@ static_library("sync") {
 static_library("test_support_sync_core") {
   testonly = true
   sources = [
+    "base/fake_encryptor.cc",
+    "base/fake_encryptor.h",
     "base/mock_unrecoverable_error_handler.cc",
     "base/mock_unrecoverable_error_handler.h",
     "base/model_type_test_util.cc",
@@ -633,8 +635,6 @@ static_library("test_support_sync_core") {
     "test/engine/test_id_factory.h",
     "test/engine/test_syncable_utils.cc",
     "test/engine/test_syncable_utils.h",
-    "test/fake_encryptor.cc",
-    "test/fake_encryptor.h",
     "test/fake_sync_encryption_handler.cc",
     "test/fake_sync_encryption_handler.h",
     "test/mock_invalidation.cc",
@@ -880,6 +880,7 @@ source_set("unit_tests") {
     "engine_impl/directory_commit_contribution_unittest.cc",
     "engine_impl/directory_update_handler_unittest.cc",
     "engine_impl/get_updates_processor_unittest.cc",
+    "engine_impl/model_type_registry_unittest.cc",
     "engine_impl/model_type_worker_unittest.cc",
     "engine_impl/sync_scheduler_unittest.cc",
     "engine_impl/syncer_proto_util_unittest.cc",
@@ -891,7 +892,6 @@ source_set("unit_tests") {
     "protocol/proto_enum_conversions_unittest.cc",
     "protocol/proto_value_conversions_unittest.cc",
     "sessions/sync_session_snapshot_unittest.cc",
-    "sessions_impl/model_type_registry_unittest.cc",
     "sessions_impl/nudge_tracker_unittest.cc",
     "sessions_impl/status_controller_unittest.cc",
     "syncable/directory_backing_store_unittest.cc",