🍱 Move browserservice's verification code into a module.

Change-Id: I8caff95f74faa0ac9509028b357dfcc146980262
Bug: 1164866
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2637498Reviewed-by: Yaron Friedman <yfriedman@chromium.org>
Reviewed-by: Ted Choc <tedchoc@chromium.org>
Reviewed-by: Ella Ge <eirage@chromium.org>
Reviewed-by: Theresa  <twellington@chromium.org>
Commit-Queue: Peter Conn <peconn@chromium.org>
Cr-Commit-Position: refs/heads/master@{#845588}

chrome/android/BUILD.gn

@@ -298,6 +298,7 @@ android_library("chrome_java") {
     "//chrome/android/webapk/libs/common:common_java",
     "//chrome/android/webapk/libs/common:splash_java",
     "//chrome/android/webapk/libs/runtime_library:webapk_service_aidl_java",
+    "//chrome/browser/android/browserservices/verification:java",
     "//chrome/browser/android/crypto:java",
     "//chrome/browser/android/lifecycle:java",
     "//chrome/browser/banners/android:java",
@@ -672,6 +673,7 @@ group("jni_headers") {
     ":chrome_jni_headers",
     "//chrome/android/features/autofill_assistant:jni_headers",
     "//chrome/android/features/keyboard_accessory:jni_headers",
+    "//chrome/browser/android/browserservices/verification:jni_headers",
     "//chrome/browser/contextmenu:jni_headers",
     "//chrome/browser/download/android:jni_headers",
     "//chrome/browser/enterprise/util:jni_headers",
@@ -717,7 +719,6 @@ java_cpp_enum("chrome_android_java_enums_srcjar") {
     "//chrome/browser/android/webapk/webapk_types.h",
     "//chrome/browser/banners/app_banner_settings_helper.h",
     "//chrome/browser/download/android/download_open_source.h",
-    "//chrome/browser/installable/digital_asset_links/digital_asset_links_handler.h",
     "//chrome/browser/installable/installed_webapp_geolocation_bridge.cc",
     "//chrome/browser/installable/quality_enforcer.cc",
     "//chrome/browser/long_screenshots/long_screenshots_tab_service.h",
@@ -806,6 +807,7 @@ junit_binary("chrome_junit_tests") {
     "//chrome/android/webapk/libs/common:common_java",
     "//chrome/android/webapk/libs/common:splash_java",
     "//chrome/android/webapk/test:junit_test_support",
+    "//chrome/browser/android/browserservices/verification:java",
     "//chrome/browser/android/lifecycle:java",
     "//chrome/browser/banners/android:java",
     "//chrome/browser/browser_controls/android:java",
@@ -1054,6 +1056,8 @@ android_library("chrome_test_java") {
     "//chrome/android/features/tab_ui:java_resources",
     "//chrome/android/webapk/libs/client:client_java",
     "//chrome/android/webapk/libs/common:common_java",
+    "//chrome/browser/android/browserservices/verification:java",
+    "//chrome/browser/android/browserservices/verification:javatests",
     "//chrome/browser/android/crypto:java",
     "//chrome/browser/android/lifecycle:java",
     "//chrome/browser/android/metrics:ukm_java_test_support",
@@ -3275,7 +3279,6 @@ generate_jni("chrome_jni_headers") {
     "java/src/org/chromium/chrome/browser/browserservices/QualityEnforcer.java",
     "java/src/org/chromium/chrome/browser/browserservices/permissiondelegation/InstalledWebappBridge.java",
     "java/src/org/chromium/chrome/browser/browserservices/permissiondelegation/InstalledWebappGeolocationBridge.java",
-    "java/src/org/chromium/chrome/browser/browserservices/verification/OriginVerifier.java",
     "java/src/org/chromium/chrome/browser/browsing_data/BrowsingDataBridge.java",
     "java/src/org/chromium/chrome/browser/browsing_data/BrowsingDataCounterBridge.java",
     "java/src/org/chromium/chrome/browser/browsing_data/UrlFilterBridge.java",

chrome/android/chrome_java_sources.gni

@@ -234,10 +234,7 @@ chrome_java_sources = [
   "java/src/org/chromium/chrome/browser/browserservices/ui/view/DisclosureInfobar.java",
   "java/src/org/chromium/chrome/browser/browserservices/ui/view/DisclosureNotification.java",
   "java/src/org/chromium/chrome/browser/browserservices/ui/view/DisclosureSnackbar.java",
-  "java/src/org/chromium/chrome/browser/browserservices/verification/OriginVerifier.java",
   "java/src/org/chromium/chrome/browser/browserservices/verification/OriginVerifierStatics.java",
-  "java/src/org/chromium/chrome/browser/browserservices/verification/Relationship.java",
-  "java/src/org/chromium/chrome/browser/browserservices/verification/VerificationResultStore.java",
   "java/src/org/chromium/chrome/browser/browsing_data/BrowsingDataBridge.java",
   "java/src/org/chromium/chrome/browser/browsing_data/BrowsingDataCounterBridge.java",
   "java/src/org/chromium/chrome/browser/browsing_data/ClearBrowsingDataCheckBoxPreference.java",

chrome/android/chrome_test_java_sources.gni

@@ -94,7 +94,6 @@ chrome_test_java_sources = [
   "javatests/src/org/chromium/chrome/browser/browserservices/ui/controller/CurrentPageVerifierTest.java",
   "javatests/src/org/chromium/chrome/browser/browserservices/ui/controller/TestVerifier.java",
   "javatests/src/org/chromium/chrome/browser/browserservices/ui/controller/trustedwebactivity/TrustedWebActivityCurrentPageVerifierTest.java",
-  "javatests/src/org/chromium/chrome/browser/browserservices/verification/OriginVerifierTest.java",
   "javatests/src/org/chromium/chrome/browser/browsing_data/BrowsingDataBridgeTest.java",
   "javatests/src/org/chromium/chrome/browser/browsing_data/BrowsingDataRemoverIntegrationTest.java",
   "javatests/src/org/chromium/chrome/browser/browsing_data/BrowsingDataTest.java",

chrome/android/expectations/lint-suppressions.xml

@@ -88,7 +88,7 @@ https://chromium.googlesource.com/chromium/src/+/master/build/android/docs/lint.
   </issue>
   <issue id="Overdraw" severity="ignore"/>
   <issue id="PackageManagerGetSignatures">
-    <ignore regexp="chrome/android/java/src/org/chromium/chrome/browser/browserservices/verification/OriginVerifier.java"/>
+    <ignore regexp="chrome/browser/android/browserservices/verification/java/src/org/chromium/chrome/browser/browserservices/verification/OriginVerifier.java"/>
     <ignore regexp="chrome/android/webapk/libs/client/src/org/chromium/webapk/lib/client/WebApkValidator.java"/>
   </issue>
   <issue id="PluralsCandidate">

chrome/android/javatests/src/org/chromium/chrome/browser/browserservices/verification/DEPS

-include_rules = [
-  "+components/externalauth/android/java/src/org/chromium/components/externalauth",
-]

chrome/browser/android/browserservices/verification/BUILD.gn

@@ -4,9 +4,52 @@
 
 import("//build/config/android/rules.gni")
 
-# Empty modules for a three sided patch.
-java_group("java") {
+android_library("java") {
+  sources = [
+    "java/src/org/chromium/chrome/browser/browserservices/verification/OriginVerifier.java",
+    "java/src/org/chromium/chrome/browser/browserservices/verification/Relationship.java",
+    "java/src/org/chromium/chrome/browser/browserservices/verification/VerificationResultStore.java",
+  ]
+  deps = [
+    "//base:base_java",
+    "//base:jni_java",
+    "//chrome/browser/flags:java",
+    "//chrome/browser/preferences:java",
+    "//chrome/browser/profiles/android:java",
+    "//components/embedder_support/android:util_java",
+    "//components/externalauth/android:java",
+    "//content/public/android:content_java",
+    "//third_party/android_deps:androidx_annotation_annotation_java",
+    "//third_party/android_deps:dagger_java",
+    "//third_party/android_deps:javax_inject_javax_inject_java",
+    "//third_party/android_sdk/androidx_browser:androidx_browser_java",
+  ]
+  srcjar_deps =
+      [ "//chrome/browser/installable/digital_asset_links:enums_srcjar" ]
+  annotation_processor_deps = [ "//base/android/jni_generator:jni_processor" ]
 }
 
-java_group("javatests") {
+generate_jni("jni_headers") {
+  sources = [ "java/src/org/chromium/chrome/browser/browserservices/verification/OriginVerifier.java" ]
+}
+
+android_library("javatests") {
+  testonly = true
+  sources = [ "./java/src/org/chromium/chrome/browser/browserservices/verification/OriginVerifierTest.java" ]
+
+  deps = [
+    ":java",
+    "//base:base_java",
+    "//base:base_java_test_support",
+    "//chrome/android:chrome_java",
+    "//chrome/browser/flags:java",
+    "//chrome/test/android:chrome_java_test_support",
+    "//components/embedder_support/android:util_java",
+    "//components/externalauth/android:java",
+    "//content/public/android:content_java",
+    "//content/public/test/android:content_java_test_support",
+    "//third_party/android_deps:androidx_test_runner_java",
+    "//third_party/android_sdk/androidx_browser:androidx_browser_java",
+    "//third_party/junit",
+  ]
 }

chrome/android/java/src/org/chromium/chrome/browser/browserservices/verification/DEPS → chrome/browser/android/browserservices/verification/DEPS

@@ -8,3 +8,12 @@ include_rules = [
   "+components/externalauth/android/java/src/org/chromium/components/externalauth",
   "+content/public/android/java/src/org/chromium/content_public/browser",
 ]
+
+specific_include_rules = {
+  '.*Test\.java': [
+    "+base/test/android",
+    "+chrome/android/java/src/org/chromium/chrome/browser/browsing_data",
+    "+chrome/test/android",
+    "+content/public/test/android/javatests/src/org/chromium/content_public/browser/test",
+  ]
+}

chrome/browser/android/customtabs/origin_verifier.cc

@@ -9,7 +9,7 @@
 #include "base/android/jni_android.h"
 #include "base/android/jni_string.h"
 #include "base/bind.h"
-#include "chrome/android/chrome_jni_headers/OriginVerifier_jni.h"
+#include "chrome/browser/android/browserservices/verification/jni_headers/OriginVerifier_jni.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/installable/digital_asset_links/digital_asset_links_handler.h"
 #include "chrome/browser/profiles/profile_android.h"

chrome/browser/installable/digital_asset_links/BUILD.gn

+# Copyright 2021 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/android/rules.gni")
+
+# Since only one target uses the generated enums, we can leave it as a
+# srcjar. If in the future, more targets want to depend on these enums,
+# we will need to introduce an android_library that contains the srcjar
+# that multiple other targets can depend on.
+java_cpp_enum("enums_srcjar") {
+  sources = [ "digital_asset_links_handler.h" ]
+}