Signin: Clean up GN structure of MutablePO2TS and webdata

In preparation for the code restructuring of //components/signin, this
CL moves mutable_profile_oauth2_token_service_delegate* from the
//components/signin/core/browser target to the
//components/signin/core/browser:internals target where it belongs. This
change has the ripple effect of requiring
//components/signin/core/browser/webdata to be separated out of
//components/signin/core/browser in GN, as MutablePO2TS depends on the
webdata. That change is also conceptually correct as webdata is
conceptually layered below all of the rest of //components/signin.

Bug: 952788
Change-Id: I309512f4904157b1881ec9860bdec2c17f371245
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1681701Reviewed-by: Mihai Sardarescu <msarda@chromium.org>
Reviewed-by: Sylvain Defresne <sdefresne@chromium.org>
Commit-Queue: Sylvain Defresne <sdefresne@chromium.org>
Cr-Commit-Position: refs/heads/master@{#673306}

chrome/browser/BUILD.gn

@@ -1996,6 +1996,7 @@ jumbo_split_static_library("browser") {
     "//components/sessions",
     "//components/signin/core/browser",
     "//components/signin/core/browser:signin_buildflags",
+    "//components/signin/core/browser/webdata",
     "//components/spellcheck:buildflags",
     "//components/ssl_errors",
     "//components/startup_metric_utils/browser:host",

chrome/browser/chromeos/BUILD.gn

@@ -190,6 +190,7 @@ source_set("chromeos") {
     "//components/safe_browsing/db:metadata_proto",
     "//components/session_manager/core",
     "//components/signin/core/browser",
+    "//components/signin/core/browser/webdata",
     "//components/storage_monitor",
     "//components/strings",
     "//components/sync",

components/BUILD.gn

@@ -139,6 +139,7 @@ test("components_unittests") {
     "//components/services/unzip:unit_tests",
     "//components/sessions:unit_tests",
     "//components/signin/core/browser:unit_tests",
+    "//components/signin/core/browser/webdata:unit_tests",
     "//components/ssl_errors:unit_tests",
     "//components/subresource_filter/core/browser:unit_tests",
     "//components/subresource_filter/core/common:unit_tests",

components/signin/core/browser/BUILD.gn

@@ -82,6 +82,8 @@ static_library("internals") {
     "child_account_info_fetcher_android.h",
     "gaia_cookie_manager_service.cc",
     "gaia_cookie_manager_service.h",
+    "mutable_profile_oauth2_token_service_delegate.cc",
+    "mutable_profile_oauth2_token_service_delegate.h",
     "oauth2_token_service_delegate_android.cc",
     "oauth2_token_service_delegate_android.h",
     "oauth_multilogin_helper.cc",
@@ -113,6 +115,8 @@ static_library("internals") {
     "//components/image_fetcher/core",
     "//components/keyed_service/core",
     "//components/prefs",
+    "//components/signin/core/browser/webdata",
+    "//components/webdata/common",
     "//google_apis",
     "//net",
     "//services/network/public/cpp",
@@ -164,8 +168,6 @@ static_library("browser") {
     "mirror_account_reconcilor_delegate.h",
     "multilogin_parameters.cc",
     "multilogin_parameters.h",
-    "mutable_profile_oauth2_token_service_delegate.cc",
-    "mutable_profile_oauth2_token_service_delegate.h",
     "signin_error_controller.cc",
     "signin_error_controller.h",
     "signin_header_helper.cc",
@@ -180,10 +182,6 @@ static_library("browser") {
     "signin_status_metrics_provider_base.h",
     "signin_status_metrics_provider_delegate.cc",
     "signin_status_metrics_provider_delegate.h",
-    "webdata/token_service_table.cc",
-    "webdata/token_service_table.h",
-    "webdata/token_web_data.cc",
-    "webdata/token_web_data.h",
   ]
 
   configs += [ "//build/config/compiler:no_size_t_to_int_warning" ]
@@ -301,7 +299,6 @@ source_set("unit_tests") {
     "signin_metrics_unittest.cc",
     "signin_status_metrics_provider_unittest.cc",
     "ubertoken_fetcher_impl_unittest.cc",
-    "webdata/token_service_table_unittest.cc",
   ]
 
   deps = [
@@ -315,6 +312,7 @@ source_set("unit_tests") {
     "//components/os_crypt:test_support",
     "//components/prefs",
     "//components/prefs:test_support",
+    "//components/signin/core/browser/webdata",
     "//components/sync_preferences",
     "//components/sync_preferences:test_support",
     "//components/webdata/common",

components/signin/core/browser/webdata/BUILD.gn

+# Copyright 2019 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.
+
+# This target cannot depend on anything else from //components/signin.
+static_library("webdata") {
+  sources = [
+    "token_service_table.cc",
+    "token_service_table.h",
+    "token_web_data.cc",
+    "token_web_data.h",
+  ]
+
+  deps = [
+    "//components/os_crypt",
+    "//sql",
+  ]
+
+  public_deps = [
+    "//base",
+    "//components/webdata/common",
+  ]
+}
+
+source_set("unit_tests") {
+  testonly = true
+  sources = [
+    "token_service_table_unittest.cc",
+  ]
+
+  deps = [
+    ":webdata",
+    "//base/test:test_support",
+    "//components/os_crypt:test_support",
+    "//components/webdata/common",
+    "//testing/gtest",
+  ]
+}

components/webdata/common/BUILD.gn

@@ -89,7 +89,7 @@ source_set("unit_tests") {
     "//components/autofill/core/common",
     "//components/password_manager/core/browser",
     "//components/search_engines",
-    "//components/signin/core/browser",
+    "//components/signin/core/browser/webdata",
     "//sql",
     "//testing/gtest",
   ]

components/webdata_services/BUILD.gn

@@ -17,7 +17,7 @@ static_library("webdata_services") {
     "//components/keyed_service/core",
     "//components/password_manager/core/browser",
     "//components/search_engines",
-    "//components/signin/core/browser",
+    "//components/signin/core/browser/webdata",
     "//components/sync",
     "//components/webdata/common",
     "//sql",

ios/chrome/browser/browser_state/BUILD.gn

@@ -26,6 +26,7 @@ source_set("browser_state") {
     "//components/prefs",
     "//components/search_engines",
     "//components/signin/core/browser",
+    "//components/signin/core/browser/webdata",
     "//components/sync_preferences",
     "//components/variations/net",
     "//components/webdata_services",

ios/web_view/BUILD.gn

@@ -283,6 +283,7 @@ ios_web_view_deps = [
   "//components/prefs",
   "//components/proxy_config",
   "//components/signin/core/browser",
+  "//components/signin/core/browser/webdata",
   "//components/signin/ios/browser",
   "//components/signin/ios/browser:active_state_manager",
   "//components/strings:components_strings_grit",