[JJI] Reorder and rename the interfaces

Per AndroidX API design guide, put single abstract method (SAM) to be
the last parameter so kotlin could interop with them.

Rename removeWebMessageListener() to unsetWebMessageListener().

Bug: 918065
Change-Id: Ief2d7fa80a4cd48185487a39b0463511cc9c6311
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1764260Reviewed-by: Richard Coles <torne@chromium.org>
Reviewed-by: Changwan Ryu <changwan@chromium.org>
Commit-Queue: Shimi Zhang <ctzsm@chromium.org>
Cr-Commit-Position: refs/heads/master@{#689604}

android_webview/browser/aw_contents.cc

@@ -1309,14 +1309,14 @@ void AwContents::OnPostMessage(
     const base::android::JavaRef<jstring>& message,
     const base::android::JavaRef<jstring>& origin,
     jboolean is_main_frame,
-    const base::android::JavaRef<jobject>& reply_proxy,
-    const base::android::JavaRef<jintArray>& ports) {
+    const base::android::JavaRef<jintArray>& ports,
+    const base::android::JavaRef<jobject>& reply_proxy) {
   const ScopedJavaLocalRef<jobject> obj = java_ref_.get(env);
   if (obj.is_null())
     return;
 
-  Java_AwContents_onPostMessage(env, obj, message, origin, is_main_frame,
-                                reply_proxy, ports);
+  Java_AwContents_onPostMessage(env, obj, message, origin, is_main_frame, ports,
+                                reply_proxy);
 }
 
 void AwContents::ClearView(JNIEnv* env, const JavaParamRef<jobject>& obj) {

android_webview/browser/aw_contents.h

@@ -231,8 +231,8 @@ class AwContents : public FindHelper::Listener,
                      const base::android::JavaRef<jstring>& message,
                      const base::android::JavaRef<jstring>& origin,
                      jboolean is_main_frame,
-                     const base::android::JavaRef<jobject>& reply_proxy,
-                     const base::android::JavaRef<jintArray>& ports);
+                     const base::android::JavaRef<jintArray>& ports,
+                     const base::android::JavaRef<jobject>& reply_proxy);
 
   bool GetViewTreeForceDarkState() { return view_tree_force_dark_state_; }
 

android_webview/browser/js_java_interaction/js_api_handler.cc

@@ -55,8 +55,8 @@ void JsApiHandler::PostMessage(
       env, base::android::ConvertUTF16ToJavaString(env, message),
       base::android::ConvertUTF8ToJavaString(env, source_origin.Serialize()),
       web_contents->GetMainFrame() == render_frame_host_,
-      reply_proxy_->GetJavaPeer(),
-      base::android::ToJavaIntArray(env, int_ports.data(), int_ports.size()));
+      base::android::ToJavaIntArray(env, int_ports.data(), int_ports.size()),
+      reply_proxy_->GetJavaPeer());
 }
 
 void JsApiHandler::SetJavaToJsMessaging(

android_webview/java/src/org/chromium/android_webview/AwContents.java

@@ -2466,19 +2466,19 @@ public class AwContents implements SmartClipProvider {
      * new {@code listener} receives messages immediately if the message's origin also matches the
      * new {@code allowedOriginRules}. {@code jsObjectName} will take effect since next navigation.
      *
-     * @param listener        The {@link WebMessageListener} to be called when received
-     *                        onPostMessage().
      * @param jsObjectName    The name for the injected JavaScript object.
      * @param allowedOrigins  A list of matching rules for the allowed origins.
      *                        The JavaScript object will be injected when the frame's origin matches
      *                        any one of the allowed origins. If a wildcard "*" is provided, it will
      *                        inject JavaScript object to all frames.
+     * @param listener        The {@link WebMessageListener} to be called when received
+     *                        onPostMessage().
      * @throws IllegalArgumentException if one of the allowedOriginRules is invalid or one of
      *                                  listener, jsObjectName and allowedOriginRules is {@code
      *                                  null}.
      */
-    public void setWebMessageListener(@NonNull WebMessageListener listener,
-            @NonNull String jsObjectName, @NonNull String[] allowedOriginRules) {
+    public void setWebMessageListener(@NonNull String jsObjectName,
+            @NonNull String[] allowedOriginRules, @NonNull WebMessageListener listener) {
         if (listener == null) {
             throw new IllegalArgumentException("listener shouldn't be null");
         }
@@ -2508,7 +2508,7 @@ public class AwContents implements SmartClipProvider {
      *  Removes the {@link WebMessageListener} sets by {@link setWebMessageListener}. It then won't
      * inject JavaScript object for navigation since next navigation.
      */
-    public void removeWebMessageListener() {
+    public void unsetWebMessageListener() {
         mWebMessageListener = null;
         nativeSetJsApiService(
                 mNativeAwContents, /* needToInjectJsObject */ false, "", new String[0]);
@@ -2519,8 +2519,8 @@ public class AwContents implements SmartClipProvider {
      * WebMessageListener}.
      */
     @CalledByNative
-    public void onPostMessage(String message, String sourceOrigin, boolean isMainFrame,
-            JsReplyProxy replyProxy, int[] ports) {
+    public void onPostMessage(String message, String sourceOrigin, boolean isMainFrame, int[] ports,
+            JsReplyProxy replyProxy) {
         if (mWebMessageListener == null) return;
         MessagePort[] messagePorts = new MessagePort[ports.length];
         for (int i = 0; i < ports.length; ++i) {

android_webview/javatests/src/org/chromium/android_webview/test/JsJavaInteractionTest.java

@@ -375,8 +375,7 @@ public class JsJavaInteractionTest {
     @Test
     @SmallTest
     @Feature({"AndroidWebView", "JsJavaInterfaction"})
-    public void testRemoveWebMessageListenerCouldPreventInjectionForNextPageLoad()
-            throws Throwable {
+    public void testUnsetWebMessageListenerCouldPreventInjectionForNextPageLoad() throws Throwable {
         setWebMessageListenerOnUiThread(mAwContents, mListener, new String[] {"*"});
 
         // Load the the page.
@@ -388,7 +387,7 @@ public class JsJavaInteractionTest {
         Assert.assertTrue(mListener.hasNoMoreOnPostMessage());
 
         // Remove WebMessageListener will disable injection for next page load.
-        TestThreadUtils.runOnUiThreadBlocking(() -> mAwContents.removeWebMessageListener());
+        TestThreadUtils.runOnUiThreadBlocking(() -> mAwContents.unsetWebMessageListener());
 
         loadUrlFromPath(POST_MESSAGE_SIMPLE_HTML);
 
@@ -686,9 +685,10 @@ public class JsJavaInteractionTest {
 
     private static void setWebMessageListenerOnUiThread(final AwContents awContents,
             final WebMessageListener listener, final String[] allowedOriginRules) {
-        TestThreadUtils.runOnUiThreadBlocking(()
-                                                      -> awContents.setWebMessageListener(listener,
-                                                              JS_OBJECT_NAME, allowedOriginRules));
+        TestThreadUtils.runOnUiThreadBlocking(
+                ()
+                        -> awContents.setWebMessageListener(
+                                JS_OBJECT_NAME, allowedOriginRules, listener));
     }
 
     private static boolean hasJavaScriptObject(final String jsObjectName,