[Sync] Fix test support targets + duplicate namespaces.

chrome/test/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/chrome_build.gni")
 import("//build/config/compiler/compiler.gni")
 import("//build/config/crypto.gni")
 import("//build/config/features.gni")
 import("//build/config/ui.gni")
 import("//chrome/common/features.gni")
@@ skipping 95 matching lines @@
     "//components/history/core/test:test",
     "//components/metrics:test_support",
     "//components/omnibox/browser:test_support",
     "//components/password_manager/core/browser:test_support",
     "//components/pref_registry:test_support",
     "//components/prefs:test_support",
     "//components/rappor:test_support",
     "//components/search_engines:test_support",
     "//components/signin/core/browser:test_support",
     "//components/sync",
-    "//components/sync:test_support_sync_driver",
+    "//components/sync:test_support_driver",
     "//components/sync_sessions:test_support",
     "//components/syncable_prefs:test_support",
     "//components/toolbar:test_support",
     "//components/update_client:test_support",
     "//components/zoom:test_support",
     "//content/public/app:both",
     "//content/test:test_support",
     "//net",
     "//net:test_support",
     "//skia",
@@ skipping 344 matching lines @@
       ":test_support",
       ":test_support_ui",
       "//chrome:packed_resources",
       "//chrome:resources",
       "//chrome:strings",
       "//chrome/browser",
       "//chrome/browser/devtools",
       "//chrome/renderer",
       "//components/resources",
       "//components/sync",
-      "//components/sync:test_support_sync_model",
+      "//components/sync:test_support_model",
       "//content/app/resources",
       "//content/test:test_support",
       "//crypto:platform",
       "//crypto:test_support",
       "//google_apis:test_support",
       "//net",
       "//net:net_resources",
       "//net:test_support",
       "//skia",
       "//testing/gmock",
@@ skipping 403 matching lines @@
     ]
     public_deps = [
       "//chrome/browser",
     ]
     deps = [
       ":test_support",
       "//base",
       "//components/invalidation/impl",
       "//components/invalidation/impl:test_support",
       "//components/sync",
-      "//components/sync:test_support_sync_fake_server",
-      "//components/sync:test_support_sync_model",
-      "//components/sync:test_support_sync_testserver",
+      "//components/sync:test_support_fake_server",
+      "//components/sync:test_support_model",
+      "//components/sync:test_support_testserver",
       "//content/test:test_support",
       "//net",
       "//skia",
     ]
 
     if (is_mac) {
       sources -= [
         "../browser/sync/test/integration/dictionary_helper.cc",
         "../browser/sync/test/integration/dictionary_helper.h",
         "../browser/sync/test/integration/dictionary_load_observer.cc",
@@ skipping 300 matching lines @@
   configs += [
     "//build/config:precompiled_headers",
     "//third_party/WebKit/public:debug_devtools",
   ]
 
   deps = [
     ":browser_tests_runner",
     ":repack_pseudo_locales",
     ":test_support",
     "//base",
-    "//components/sync:test_support_sync_model",
+    "//components/sync:test_support_model",
   ]
 
   data_deps = []
 
   data = []
 
   defines = [ "HAS_OUT_OF_PROC_TEST_RUNNER" ]
 
   if (is_win) {
     data += [ "$root_out_dir/chrome_200_percent.pak" ]
@@ skipping 2160 matching lines @@
     "//chrome:browser_dependencies",
     "//chrome:child_dependencies",
 
     # 2) test-specific support libraries:
     ":test_support",
     ":test_support_unit",
     "//base/test:test_support",
     "//components/browser_sync:test_support",
     "//components/content_settings/core/test:test_support",
     "//components/resources",
-    "//components/sync:test_support_sync_core",
-    "//components/sync:test_support_sync_core_impl",
-    "//components/sync:test_support_sync_model",
+    "//components/sync:test_support_driver",
+    "//components/sync:test_support_model",
     "//components/sync_sessions:test_support",
     "//content/public/app:both",
     "//content/test:test_support",
     "//crypto:platform",
     "//crypto:test_support",
     "//net",
     "//net:test_support",
     "//testing/gmock",
     "//testing/gtest",
 
@@ skipping 1604 matching lines @@
       "touch_hud",
       "ui",
     ]
 
     if (is_linux && !is_android) {
       deps += [ "//components/font_service:manifest" ]
       packaged_services += [ "font_service" ]
     }
   }
 }