[Sync] //components/sync external changes [DO NOT SUBMIT]

chrome/test/BUILD.gn

Index: chrome/test/BUILD.gn
diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn
index 0ba5f6ebc2a42060bc50feebf203360f4b1937e9..3249236c6be47a9b40ae87e161cf65388134a37c 100644
--- a/chrome/test/BUILD.gn
+++ b/chrome/test/BUILD.gn
@@ -110,6 +110,7 @@ static_library("test_support") {
     "//components/rappor:test_support",
     "//components/search_engines:test_support",
     "//components/signin/core/browser:test_support",
+    "//components/sync",
     "//components/sync_driver:test_support",
     "//components/sync_sessions:test_support",
     "//components/syncable_prefs:test_support",
@@ -123,7 +124,6 @@ static_library("test_support") {
     "//skia",
     "//sql",
     "//sql:test_support",
-    "//sync",
     "//testing/gmock",
     "//testing/gtest",
     "//third_party/zlib",
@@ -412,6 +412,8 @@ if (!is_android) {
       "//chrome/browser/devtools",
       "//chrome/renderer",
       "//components/resources",
+      "//components/sync",
+      "//components/sync:test_support_sync_api",
       "//content/app/resources",
       "//content/test:test_support",
       "//crypto:platform",
@@ -421,8 +423,6 @@ if (!is_android) {
       "//net:net_resources",
       "//net:test_support",
       "//skia",
-      "//sync",
-      "//sync:test_support_sync_api",
       "//testing/gmock",
       "//testing/gtest",
       "//third_party/hunspell",
@@ -697,12 +697,12 @@ if (!is_android) {
       "//base",
       "//components/invalidation/impl",
       "//components/invalidation/impl:test_support",
+      "//components/sync",
+      "//components/sync:test_support_sync_fake_server",
+      "//components/sync:test_support_sync_testserver",
       "//content/test:test_support",
       "//net",
       "//skia",
-      "//sync",
-      "//sync:test_support_sync_fake_server",
-      "//sync:test_support_sync_testserver",
     ]
 
     if (is_mac) {
@@ -881,7 +881,7 @@ test("browser_tests") {
   deps = [
     ":test_support",
     "//base",
-    "//sync:test_support_sync_api",
+    "//components/sync:test_support_sync_api",
   ]
 
   data_deps = []
@@ -968,6 +968,7 @@ test("browser_tests") {
       "//components/resources",
       "//components/safe_browsing_db:test_database_manager",
       "//components/strings",
+      "//components/sync",
       "//components/translate/core/common",
       "//content/public/common:features",
       "//content/test:test_support",
@@ -984,7 +985,6 @@ test("browser_tests") {
       "//net:test_support",
       "//sdch",
       "//skia",
-      "//sync",
       "//testing/gmock",
       "//testing/gtest",
       "//testing/perf",
@@ -1514,7 +1514,7 @@ if (!is_android) {
     data = [
       "//chrome/test/data/sync/",
       "//net/tools/testserver/",
-      "//sync/tools/testserver/",
+      "//components/sync/tools/testserver/",
       "//third_party/pyftpdlib/",
       "//third_party/pywebsocket/",
       "//third_party/tlslite/",
@@ -1542,8 +1542,8 @@ if (!is_android) {
       "//chrome:strings",
       "//chrome/common",
       "//chrome/renderer",
+      "//components/sync",
       "//crypto:platform",
-      "//sync",
       "//testing/gmock",
       "//testing/gtest",
       "//third_party/WebKit/public:blink",
@@ -1619,8 +1619,8 @@ if (!is_android) {
     deps = [
       ":sync_integration_test_support",
       ":test_support_ui",
+      "//components/sync",
       "//crypto:platform",
-      "//sync",
       "//testing/gmock",
       "//testing/gtest",
     ]
@@ -1786,15 +1786,15 @@ test("unit_tests") {
     "//components/browser_sync/browser:test_support",
     "//components/content_settings/core/test:test_support",
     "//components/resources",
+    "//components/sync:test_support_sync_api",
+    "//components/sync:test_support_sync_core",
+    "//components/sync:test_support_sync_core_impl",
     "//content/public/app:both",
     "//content/test:test_support",
     "//crypto:platform",
     "//crypto:test_support",
     "//net",
     "//net:test_support",
-    "//sync:test_support_sync_api",
-    "//sync:test_support_sync_core",
-    "//sync:test_support_sync_internal_api",
     "//testing/gmock",
     "//testing/gtest",