[Sync] Fix test support targets + duplicate namespaces.

components/sync/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/buildflag_header.gni")
 import("//build/config/features.gni")
 import("//components/sync/protocol/protocol_sources.gni")
 import("//testing/test.gni")
 
 static_library("sync") {
@@ skipping 582 matching lines @@
     ]
     deps += [
       "//components/policy:generated",
       "//components/policy/core/browser",
     ]
   }
 
   configs += [ "//build/config/compiler:wexit_time_destructors" ]
 }
 
-# TODO(maxbogue): Refactor the test support targets to remove core references.
-static_library("test_support_sync_core") {
+static_library("test_support_base") {
   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",
     "base/model_type_test_util.h",
     "base/test_unrecoverable_error_handler.cc",
     "base/test_unrecoverable_error_handler.h",
-    "engine_impl/cycle/mock_debug_info_getter.cc",
-    "engine_impl/cycle/mock_debug_info_getter.h",
-    "engine_impl/cycle/test_util.cc",
-    "engine_impl/cycle/test_util.h",
     "js/js_test_util.cc",
     "js/js_test_util.h",
     "test/callback_counter.h",
-    "test/directory_backing_store_corruption_testing.cc",
-    "test/directory_backing_store_corruption_testing.h",
-    "test/engine/fake_model_worker.cc",
-    "test/engine/fake_model_worker.h",
-    "test/engine/fake_sync_scheduler.cc",
-    "test/engine/fake_sync_scheduler.h",
-    "test/engine/mock_connection_manager.cc",
-    "test/engine/mock_connection_manager.h",
-    "test/engine/mock_model_type_processor.cc",
-    "test/engine/mock_model_type_processor.h",
-    "test/engine/mock_model_type_worker.cc",
-    "test/engine/mock_model_type_worker.h",
-    "test/engine/mock_nudge_handler.cc",
-    "test/engine/mock_nudge_handler.h",
-    "test/engine/mock_update_handler.cc",
-    "test/engine/mock_update_handler.h",
-    "test/engine/single_type_mock_server.cc",
-    "test/engine/single_type_mock_server.h",
-    "test/engine/test_directory_setter_upper.cc",
-    "test/engine/test_directory_setter_upper.h",
-    "test/engine/test_id_factory.h",
-    "test/engine/test_syncable_utils.cc",
-    "test/engine/test_syncable_utils.h",
-    "test/fake_sync_encryption_handler.cc",
-    "test/fake_sync_encryption_handler.h",
     "test/mock_invalidation.cc",
     "test/mock_invalidation.h",
     "test/mock_invalidation_tracker.cc",
     "test/mock_invalidation_tracker.h",
-    "test/null_directory_change_delegate.cc",
-    "test/null_directory_change_delegate.h",
-    "test/null_transaction_observer.cc",
-    "test/null_transaction_observer.h",
-    "test/test_directory_backing_store.cc",
-    "test/test_directory_backing_store.h",
-    "test/test_transaction_observer.cc",
-    "test/test_transaction_observer.h",
     "test/trackable_mock_invalidation.cc",
     "test/trackable_mock_invalidation.h",
   ]
 
   public_deps = [
     "//base",
-    "//components/sync",
     "//testing/gmock",
     "//testing/gtest",
   ]
 
+  deps = [
+    ":sync",
+  ]
+
   defines = [ "SYNC_TEST" ]
   configs += [ "//build/config/compiler:wexit_time_destructors" ]
 }
 
-# TODO(maxbogue): Refactor the test support targets to remove core references.
-static_library("test_support_sync_core_impl") {
+static_library("test_support_engine") {
   testonly = true
   sources = [
     "engine/fake_model_type_connector.cc",
     "engine/fake_model_type_connector.h",
     "engine/fake_model_type_processor.cc",
     "engine/fake_model_type_processor.h",
     "engine/fake_sync_manager.cc",
     "engine/fake_sync_manager.h",
     "engine/sync_manager_factory_for_profile_sync_test.cc",
     "engine/sync_manager_factory_for_profile_sync_test.h",
     "engine/test_engine_components_factory.cc",
     "engine/test_engine_components_factory.h",
+    "engine_impl/cycle/mock_debug_info_getter.cc",
+    "engine_impl/cycle/mock_debug_info_getter.h",
+    "engine_impl/cycle/test_util.cc",
+    "engine_impl/cycle/test_util.h",
     "engine_impl/sync_manager_for_profile_sync_test.cc",
     "engine_impl/sync_manager_for_profile_sync_test.h",
     "engine_impl/test_entry_factory.cc",
     "engine_impl/test_entry_factory.h",
-    "model/data_type_error_handler_mock.cc",
-    "model/data_type_error_handler_mock.h",
-    "model/model_type_store_test_util.cc",
-    "model/model_type_store_test_util.h",
     "syncable/test_user_share.cc",
     "syncable/test_user_share.h",
+    "test/directory_backing_store_corruption_testing.cc",
+    "test/directory_backing_store_corruption_testing.h",
+    "test/engine/fake_model_worker.cc",
+    "test/engine/fake_model_worker.h",
+    "test/engine/fake_sync_scheduler.cc",
+    "test/engine/fake_sync_scheduler.h",
+    "test/engine/mock_connection_manager.cc",
+    "test/engine/mock_connection_manager.h",
+    "test/engine/mock_model_type_processor.cc",
+    "test/engine/mock_model_type_processor.h",
+    "test/engine/mock_model_type_worker.cc",
+    "test/engine/mock_model_type_worker.h",
+    "test/engine/mock_nudge_handler.cc",
+    "test/engine/mock_nudge_handler.h",
+    "test/engine/mock_update_handler.cc",
+    "test/engine/mock_update_handler.h",
+    "test/engine/single_type_mock_server.cc",
+    "test/engine/single_type_mock_server.h",
+    "test/engine/test_directory_setter_upper.cc",
+    "test/engine/test_directory_setter_upper.h",
+    "test/engine/test_id_factory.h",
+    "test/engine/test_syncable_utils.cc",
+    "test/engine/test_syncable_utils.h",
+    "test/fake_sync_encryption_handler.cc",
+    "test/fake_sync_encryption_handler.h",
+    "test/null_directory_change_delegate.cc",
+    "test/null_directory_change_delegate.h",
+    "test/null_transaction_observer.cc",
+    "test/null_transaction_observer.h",
+    "test/test_directory_backing_store.cc",
+    "test/test_directory_backing_store.h",
+    "test/test_transaction_observer.cc",
+    "test/test_transaction_observer.h",
   ]
 
   public_deps = [
-    ":test_support_sync_core",
-    "//base",
-    "//components/sync",
-    "//testing/gtest",
+    ":test_support_base",
+  ]
+
+  deps = [
+    ":sync",
   ]
 
   defines = [ "SYNC_TEST" ]
   configs += [ "//build/config/compiler:wexit_time_destructors" ]
 }
 
-static_library("test_support_sync_model") {
+static_library("test_support_model") {
   testonly = true
   sources = [
+    "model/data_type_error_handler_mock.cc",
+    "model/data_type_error_handler_mock.h",
     "model/fake_model_type_change_processor.cc",
     "model/fake_model_type_change_processor.h",
     "model/fake_model_type_service.cc",
     "model/fake_model_type_service.h",
     "model/fake_sync_change_processor.cc",
     "model/fake_sync_change_processor.h",
     "model/fake_syncable_service.cc",
     "model/fake_syncable_service.h",
     "model/mock_model_type_store.cc",
     "model/mock_model_type_store.h",
+    "model/model_type_store_test_util.cc",
+    "model/model_type_store_test_util.h",
     "model/stub_model_type_service.cc",
     "model/stub_model_type_service.h",
     "model/sync_change_processor_wrapper_for_test.cc",
     "model/sync_change_processor_wrapper_for_test.h",
     "model/sync_error_factory_mock.cc",
     "model/sync_error_factory_mock.h",
   ]
 
   defines = [ "SYNC_TEST" ]
 
   public_deps = [
-    "//base",
-    "//components/sync",
-    "//testing/gmock",
-    "//testing/gtest",
+    ":test_support_base",
+  ]
+
+  deps = [
+    ":sync",
   ]
 }
 
-static_library("test_support_sync_driver") {
+static_library("test_support_driver") {
   testonly = true
   sources = [
     "device_info/local_device_info_provider_mock.cc",
     "device_info/local_device_info_provider_mock.h",
     "driver/change_processor_mock.cc",
     "driver/change_processor_mock.h",
     "driver/data_type_controller_mock.cc",
     "driver/data_type_controller_mock.h",
     "driver/data_type_manager_mock.cc",
     "driver/data_type_manager_mock.h",
@@ skipping 11 matching lines @@
     "driver/glue/sync_backend_host_mock.h",
     "driver/model_associator_mock.cc",
     "driver/model_associator_mock.h",
     "driver/non_ui_data_type_controller_mock.cc",
     "driver/non_ui_data_type_controller_mock.h",
     "driver/sync_api_component_factory_mock.cc",
     "driver/sync_api_component_factory_mock.h",
   ]
 
   public_deps = [
-    "//components/sync",
+    ":test_support_base",
   ]
 
   deps = [
-    ":test_support_sync_core_impl",
-    "//base",
+    ":sync",
+    ":test_support_engine",
     "//components/syncable_prefs:test_support",
     "//components/version_info",
     "//google_apis",
-    "//testing/gmock",
-    "//testing/gtest",
   ]
 }
 
 source_set("unit_tests") {
   testonly = true
   sources = [
     "base/attachment_id_proto_unittest.cc",
     "base/bind_to_task_runner_unittest.cc",
     "base/cancelation_signal_unittest.cc",
     "base/cryptographer_unittest.cc",
@@ skipping 107 matching lines @@
   data = [
     "//chrome/test/data/sync/",
     "//net/tools/testserver/",
     "//third_party/pyftpdlib/",
     "//third_party/pywebsocket/",
     "//third_party/tlslite/",
     "$root_out_dir/pyproto/google/",
   ]
 
   deps = [
-    ":test_support_sync_core",
-    ":test_support_sync_core_impl",
-    ":test_support_sync_driver",
-    ":test_support_sync_model",
+    ":sync",
+    ":test_support_base",
+    ":test_support_driver",
+    ":test_support_engine",
+    ":test_support_model",
     "//base",
     "//base/test:test_support",
     "//components/invalidation/impl",
     "//components/os_crypt:test_support",
     "//components/pref_registry:test_support",
     "//components/prefs:test_support",
     "//components/signin/core/browser:test_support",
-    "//components/sync",
     "//components/sync/engine_impl/attachments/proto",
     "//components/syncable_prefs",
     "//components/syncable_prefs:test_support",
     "//components/version_info",
     "//google_apis",
     "//google_apis:test_support",
     "//net",
     "//net:test_support",
     "//sql",
     "//sql:test_support",
@@ skipping 17 matching lines @@
     sources += [ "driver/sync_policy_handler_unittest.cc" ]
     deps += [
       "//components/policy:generated",
       "//components/policy/core/browser",
     ]
   }
 
   defines = [ "SYNC_TEST" ]
 }
 
-static_library("test_support_sync_fake_server") {
+static_library("test_support_fake_server") {
   testonly = true
   sources = [
     "test/fake_server/bookmark_entity.cc",
     "test/fake_server/bookmark_entity.h",
     "test/fake_server/bookmark_entity_builder.cc",
     "test/fake_server/bookmark_entity_builder.h",
     "test/fake_server/entity_builder_factory.cc",
     "test/fake_server/entity_builder_factory.h",
     "test/fake_server/fake_server.cc",
     "test/fake_server/fake_server.h",
     "test/fake_server/fake_server_entity.cc",
     "test/fake_server/fake_server_entity.h",
     "test/fake_server/fake_server_http_post_provider.cc",
     "test/fake_server/fake_server_http_post_provider.h",
     "test/fake_server/fake_server_network_resources.cc",
     "test/fake_server/fake_server_network_resources.h",
     "test/fake_server/fake_server_verifier.cc",
     "test/fake_server/fake_server_verifier.h",
     "test/fake_server/permanent_entity.cc",
     "test/fake_server/permanent_entity.h",
     "test/fake_server/sessions_hierarchy.cc",
     "test/fake_server/sessions_hierarchy.h",
     "test/fake_server/tombstone_entity.cc",
     "test/fake_server/tombstone_entity.h",
     "test/fake_server/unique_client_entity.cc",
     "test/fake_server/unique_client_entity.h",
   ]
 
   deps = [
+    ":sync",
     "//base",
-    "//components/sync",
     "//net",
     "//testing/gtest",
     "//url",
   ]
 
   public_deps = [
     "//third_party/protobuf:protobuf_lite",
   ]
 
   configs += [ "//build/config/compiler:wexit_time_destructors" ]
 }
 
-static_library("test_support_sync_testserver") {
+static_library("test_support_testserver") {
   testonly = true
   sources = [
     "test/local_sync_test_server.cc",
     "test/local_sync_test_server.h",
   ]
 
   configs += [ "//build/config/compiler:wexit_time_destructors" ]
 
   public_deps = [
     "//base",
     "//net:test_support",
   ]
   deps = [
     ":sync",
 
     # The sync test server uses Python modules generated by the sync protos.
     "//third_party/protobuf:py_proto",
   ]
 }
 
 if (!is_ios) {
   executable("run_sync_testserver") {
     testonly = true
     sources = [
       "tools/testserver/run_sync_testserver.cc",
     ]
 
     deps = [
-      ":test_support_sync_testserver",
+      ":test_support_testserver",
       "//base",
       "//base/test:test_support",
       "//build/config/sanitizers:deps",
       "//build/win:default_exe_manifest",
       "//net:test_support",
       "//testing/gtest",
     ]
   }
 }
 
 if (is_android) {
   import("//build/config/android/rules.gni")
 
   generate_jni("fake_server_jni") {
     testonly = true
     jni_package = "sync/test/fake_server"
     sources = [
       "//chrome/android/sync_shell/javatests/src/org/chromium/chrome/browser/sync/FakeServerHelper.java",
     ]
   }
 
-  _test_support_sync_prepared_protos_dir =
-      "$root_gen_dir/test_support_sync_proto_java_prepare/"
-  action("test_support_sync_proto_java_prepare") {
+  _test_support_prepared_protos_dir =
+      "$root_gen_dir/test_support_proto_java_prepare/"
+  action("test_support_proto_java_prepare") {
     script = "//components/sync/protocol/prepare_protos_for_java_tests.py"
     inputs = sync_protocol_sources
     outputs = process_file_template(
             sync_protocol_sources,
-            [ "$_test_support_sync_prepared_protos_dir/{{source_file_part}}" ])
+            [ "$_test_support_prepared_protos_dir/{{source_file_part}}" ])
     args = [
       "--output_dir",
-      rebase_path(_test_support_sync_prepared_protos_dir, root_build_dir),
+      rebase_path(_test_support_prepared_protos_dir, root_build_dir),
     ]
     args += rebase_path(sync_protocol_sources, root_build_dir)
   }
 
-  proto_java_library("test_support_sync_proto_java") {
-    proto_path = _test_support_sync_prepared_protos_dir
-    sources = get_target_outputs(":test_support_sync_proto_java_prepare")
+  proto_java_library("test_support_proto_java") {
+    proto_path = _test_support_prepared_protos_dir
+    sources = get_target_outputs(":test_support_proto_java_prepare")
     deps = [
-      ":test_support_sync_proto_java_prepare",
+      ":test_support_proto_java_prepare",
     ]
   }
 
   android_library("sync_java_test_support") {
     testonly = true
     deps = [
       "android:sync_java",
       "//base:base_java",
     ]
     java_files = [ "test/android/javatests/src/org/chromium/components/sync/test/util/MockSyncContentResolverDelegate.java" ]
   }
 
-  static_library("test_support_sync_fake_server_android") {
+  static_library("test_support_fake_server_android") {
     testonly = true
     sources = [
       "test/fake_server/android/fake_server_helper_android.cc",
       "test/fake_server/android/fake_server_helper_android.h",
     ]
     deps = [
       ":fake_server_jni",
       ":sync",
-      ":test_support_sync_fake_server",
+      ":test_support_fake_server",
       "//base",
       "//testing/gtest",
       "//url:url",
     ]
   }
 }