Merge //ios/chrome/browser/signin:{authentication_service,signin}.

ios/chrome/browser/signin/BUILD.gn

 # Copyright 2016 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.
 
 source_set("signin") {
   sources = [
     "about_signin_internals_factory.cc",
     "about_signin_internals_factory.h",
     "account_consistency_service_factory.h",
     "account_consistency_service_factory.mm",
     "account_fetcher_service_factory.cc",
     "account_fetcher_service_factory.h",
     "account_reconcilor_factory.cc",
     "account_reconcilor_factory.h",
     "account_tracker_service_factory.cc",
     "account_tracker_service_factory.h",
+    "authentication_service.h",
+    "authentication_service.mm",
+    "authentication_service_factory.h",
+    "authentication_service_factory.mm",
     "browser_state_data_remover.h",
     "browser_state_data_remover.mm",
     "chrome_identity_service_observer_bridge.h",
     "chrome_identity_service_observer_bridge.mm",
     "constants.h",
     "constants.mm",
     "gaia_auth_fetcher_ios.h",
     "gaia_auth_fetcher_ios.mm",
     "gaia_auth_fetcher_ios_private.h",
     "gaia_cookie_manager_service_factory.cc",
@@ skipping 10 matching lines @@
     "signin_client_impl.mm",
     "signin_error_controller_factory.cc",
     "signin_error_controller_factory.h",
     "signin_manager_factory.cc",
     "signin_manager_factory.h",
     "signin_manager_factory_observer.h",
     "signin_util.h",
     "signin_util.mm",
   ]
   deps = [
-    "//components/pref_registry",
-    "//components/prefs",
+    "//components/browser_sync",
+    "//components/sync",
     "//ios/web",
     "//url",
   ]
   public_deps = [
     "//base",
     "//components/content_settings/core/browser",
+    "//components/keyed_service/core",
     "//components/keyed_service/ios",
     "//components/metrics",
+    "//components/pref_registry",
     "//components/prefs",
     "//components/signin/core/browser",
     "//components/signin/ios/browser",
     "//google_apis",
     "//ios/chrome/common",
     "//ios/public/provider/chrome/browser",
     "//net",
   ]
 }
 
 # Temporary target to allow upstreaming authentication_service*.{cc,h}
 # without breaking downstream repository when rolling the CL. Will be
 # removed once downstream code no longer use it.
-source_set("authentication_service") {
-  sources = [
-    "authentication_service.h",
-    "authentication_service.mm",
-    "authentication_service_factory.h",
-    "authentication_service_factory.mm",
-  ]
-  deps = [
-    ":signin",
-    "//components/browser_sync",
-    "//components/prefs",
-    "//components/signin/ios/browser",
-    "//components/sync",
-    "//ios/chrome/browser",
-  ]
-  public_deps = [
-    "//base",
-    "//components/keyed_service/core",
-    "//components/keyed_service/ios",
-    "//components/pref_registry",
-    "//components/signin/core/browser",
-    "//google_apis",
-    "//ios/public/provider/chrome/browser",
-  ]
+group("authentication_service") {
 }
 
 source_set("test_support") {
   testonly = true
   sources = [
+    "authentication_service_fake.h",
+    "authentication_service_fake.mm",
     "fake_oauth2_token_service_builder.h",
     "fake_oauth2_token_service_builder.mm",
     "fake_signin_manager_builder.cc",
     "fake_signin_manager_builder.h",
   ]
   deps = [
-    ":signin",
-    "//base",
     "//components/signin/core/browser:test_support",
     "//components/signin/ios/browser",
     "//ios/chrome/browser",
   ]
+  public_deps = [
+    ":signin",
+    "//base",
+    "//ios/public/provider/chrome/browser",
+  ]
 }
 
 # Temporary target to allow upstreaming authentication_service*.{cc,h}
 # without breaking downstream repository when rolling the CL. Will be
 # removed once downstream code no longer use it.
-source_set("authentication_service_test_support") {
+group("authentication_service_test_support") {
   testonly = true
-  sources = [
-    "authentication_service_fake.h",
-    "authentication_service_fake.mm",
-  ]
-  deps = [
-    "//ios/chrome/browser",
-  ]
-  public_deps = [
-    ":authentication_service",
-    ":signin",
-    "//base",
-    "//ios/public/provider/chrome/browser",
-  ]
 }
 
 source_set("unit_tests") {
   testonly = true
   sources = [
     "authentication_service_unittest.mm",
     "chrome_identity_service_observer_bridge_unittest.mm",
     "gaia_auth_fetcher_ios_unittest.mm",
   ]
   deps = [
-    ":authentication_service",
     ":signin",
     ":test_support",
     "//base",
     "//components/browser_sync:test_support",
     "//components/pref_registry",
     "//components/prefs",
     "//components/signin/core/browser",
     "//components/signin/core/browser:test_support",
     "//components/signin/core/common",
     "//components/signin/ios/browser",
     "//components/syncable_prefs",
     "//components/syncable_prefs:test_support",
     "//google_apis",
     "//ios/chrome/browser",
     "//ios/chrome/browser:test_support",
     "//ios/chrome/test",
     "//ios/public/provider/chrome/browser",
     "//ios/public/provider/chrome/browser:test_support",
     "//ios/web:test_support",
     "//net:test_support",
     "//testing/gmock",
     "//testing/gtest",
     "//third_party/ocmock",
   ]
 }