[WebLayer] Add build configs for upstream safebrowsing deps.

Because weblayer is packaged together with WebView the
upstream vs downstream (i.e. public vs internal)
implementations need to be compiled depending on the
existing targets. For example we can have AOSP targets
(with clank/ present) in which case we still need to
use the upstream version of the safebrowsing related
class (GmsBridgeImpl.java).

To have this effect this patch updates the
upstream_only_deps variable to include the weblayer
safebrowsing upstream target. It also updates the deps
of WebLayerSupport.apk to always have the upstream
(public) target.

Analogously the downstream build configs will be updated
to include the downstream version (in a separate
downstream patch).

BUG=1015418

Change-Id: I0a38295610b306a018c1565b4e96f89a080ca20a
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1895658
Commit-Queue: Tim Volodine <timvolodine@chromium.org>
Reviewed-by: Richard Coles <torne@chromium.org>
Cr-Commit-Position: refs/heads/master@{#713936}

android_webview/variables.gni

@@ -16,6 +16,7 @@ trichrome_webview_64_32_android_manifest = "$root_gen_dir/android_webview/trichr
 upstream_only_webview_deps = [
   "//android_webview:platform_service_bridge_upstream_implementation_java",
   "//android_webview/apk:icon_resources",
+  "//weblayer/browser/java:gms_bridge_upstream_impl_java",
 ]
 
 webview_product_config_java_package = "org.chromium.android_webview"

weblayer/browser/java/BUILD.gn

@@ -73,10 +73,6 @@ android_library("java") {
   # Needed for android.webkit.WebView(Delegate|Factory)
   alternative_android_sdk_dep =
       "//third_party/android_sdk:public_framework_system_java"
-
-  # TODO(timvolodine): once the downstream implementation of GmsBridgeImpl.java
-  # lands make sure to exclude this when "enable_chrome_android_internal" is true.
-  deps += [ ":gms_bridge_upstream_impl_java" ]
 }
 
 generate_jni("jni") {

weblayer/shell/android/BUILD.gn

@@ -165,6 +165,10 @@ android_apk("weblayer_support_apk") {
     "//mojo/public/java:system_java",
     "//net/android:net_java",
   ]
+
+  # default upstream safebrowsing related classes
+  deps += [ "//weblayer/browser/java:gms_bridge_upstream_impl_java" ]
+
   apk_name = "WebLayerSupport"
   android_manifest = weblayer_support_manifest
   min_sdk_version = 21

weblayer/test/BUILD.gn

@@ -122,7 +122,11 @@ test("weblayer_browsertests") {
 
       # Needed for WebLayerImpl.
       "//weblayer/browser/java",
+
+      # default upstream safebrowsing related classes
+      "//weblayer/browser/java:gms_bridge_upstream_impl_java",
     ]
+
     android_manifest =
         "${target_gen_dir}/weblayer_browsertests_manifest/AndroidManifest.xml"
     android_manifest_dep = ":weblayer_browsertests_manifest"