[AndroidX Webkit] roll boundary interfaces to 24b3ad7androidx-wear-wear-remote-interactions-releaseandroidx-wear-wear-phone-interactions-releaseandroidx-wear-wear-ongoing-releaseandroidx-resourceinspection-releaseandroidx-metrics-release

This rolls the boundary interfaces for the androidx.webkit module
to include the following commit range:
https://android.googlesource.com/platform/external/webview_support_interfaces/+log/5516718e014d098392958691c8e77badb3bc27a4..24b3ad70385c0c5655af7ebd4af705512d1f949f

Test: N/A
Change-Id: Ie5378102d9c08d751a623905f4e8ff98bf9a42b4

5 files changed, 17 insertions, 3 deletions

diff --git a/BUILD.gn b/BUILD.gn
index d3c7500..68b6ca5 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -12,6 +12,7 @@ android_library("boundary_interface_java") {
     "src/org/chromium/support_lib_boundary/JsReplyProxyBoundaryInterface.java",
     "src/org/chromium/support_lib_boundary/ProxyControllerBoundaryInterface.java",
     "src/org/chromium/support_lib_boundary/SafeBrowsingResponseBoundaryInterface.java",
+    "src/org/chromium/support_lib_boundary/ScriptHandlerBoundaryInterface.java",
     "src/org/chromium/support_lib_boundary/ScriptReferenceBoundaryInterface.java",
     "src/org/chromium/support_lib_boundary/ServiceWorkerClientBoundaryInterface.java",
     "src/org/chromium/support_lib_boundary/ServiceWorkerControllerBoundaryInterface.java",
@@ -42,7 +43,7 @@ android_library("boundary_interface_java") {
   # build when we mirror this into AndroidX. We are only permitted to depend on
   # core Android classes and other AndroidX classes (must be in the androidx.*
   # package name).
-  deps = [ "//third_party/android_deps:androidx_annotation_annotation_java" ]
+  deps = [ "//third_party/androidx:androidx_annotation_annotation_java" ]
 }
 
 android_apk("boundary_interface_example_apk") {
diff --git a/src/org/chromium/support_lib_boundary/ScriptHandlerBoundaryInterface.java b/src/org/chromium/support_lib_boundary/ScriptHandlerBoundaryInterface.java
new file mode 100644
index 0000000..4dcaa75
--- /dev/null
+++ b/src/org/chromium/support_lib_boundary/ScriptHandlerBoundaryInterface.java
@@ -0,0 +1,10 @@
+// Copyright 2020 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.
+
+package org.chromium.support_lib_boundary;
+
+/**
+ * Boundary interface for AwContents.addDocumentStartJavascript().
+ */
+public interface ScriptHandlerBoundaryInterface extends ScriptReferenceBoundaryInterface {}
diff --git a/src/org/chromium/support_lib_boundary/ScriptReferenceBoundaryInterface.java b/src/org/chromium/support_lib_boundary/ScriptReferenceBoundaryInterface.java
index 6358e00..aba822a 100644
--- a/src/org/chromium/support_lib_boundary/ScriptReferenceBoundaryInterface.java
+++ b/src/org/chromium/support_lib_boundary/ScriptReferenceBoundaryInterface.java
@@ -6,6 +6,9 @@ package org.chromium.support_lib_boundary;
 
 /**
  * Boundary interface for AwContents.addDocumentStartJavascript().
+ *
+ * TODO(ctzsm): Delete this interface once we've updated the APKs on
+ * the AndroidX bots and move the remove method to ScriptHandlerBoundaryInterface.
  */
 public interface ScriptReferenceBoundaryInterface {
     void remove();
diff --git a/src/org/chromium/support_lib_boundary/WebViewProviderBoundaryInterface.java b/src/org/chromium/support_lib_boundary/WebViewProviderBoundaryInterface.java
index 843d387..d524b31 100644
--- a/src/org/chromium/support_lib_boundary/WebViewProviderBoundaryInterface.java
+++ b/src/org/chromium/support_lib_boundary/WebViewProviderBoundaryInterface.java
@@ -20,7 +20,7 @@ public interface WebViewProviderBoundaryInterface {
     void addWebMessageListener(String jsObjectName, String[] allowedOriginRules,
             /* WebMessageListener */ InvocationHandler listener);
     void removeWebMessageListener(String jsObjectName);
-    /* ScriptReference */ InvocationHandler addDocumentStartJavaScript(
+    /* ScriptHandler */ InvocationHandler addDocumentStartJavaScript(
             String script, String[] allowedOriginRules);
     WebViewClient getWebViewClient();
     WebChromeClient getWebChromeClient();
diff --git a/src/org/chromium/support_lib_boundary/util/Features.java b/src/org/chromium/support_lib_boundary/util/Features.java
index b2f55e1..3038a4f 100644
--- a/src/org/chromium/support_lib_boundary/util/Features.java
+++ b/src/org/chromium/support_lib_boundary/util/Features.java
@@ -184,5 +184,5 @@ public class Features {
     public static final String SET_SUPPORT_LIBRARY_VERSION = "SET_SUPPORT_LIBRARY_VERSION";
 
     // WebViewCompat.addDocumentStartJavascript
-    public static final String DOCUMENT_START_SCRIPT = "DOCUMENT_START_SCRIPT:1";
+    public static final String DOCUMENT_START_SCRIPT = "DOCUMENT_START_SCRIPT";
 }