[JJI] Remove AwContents param from WebMessageListener#onPostMessage()

This param is not necessary, since glue layer will figure out the
WebView instance.

In prepare of http://crrev/c/1745462.

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

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

@@ -2527,8 +2527,8 @@ public class AwContents implements SmartClipProvider {
             messagePorts[i] = convertRawHandleToMessagePort(ports[i]);
         }
         MessagePort replyMessagePort = convertRawHandleToMessagePort(replyPort);
-        mWebMessageListener.onPostMessage(this, message, Uri.parse(sourceOrigin), isMainFrame,
-                replyMessagePort, messagePorts);
+        mWebMessageListener.onPostMessage(
+                message, Uri.parse(sourceOrigin), isMainFrame, replyMessagePort, messagePorts);
     }
 
     private static MessagePort convertRawHandleToMessagePort(int rawHandle) {

android_webview/java/src/org/chromium/android_webview/WebMessageListener.java

@@ -16,7 +16,6 @@ import org.chromium.content_public.browser.MessagePort;
 public interface WebMessageListener {
     /**
      * Receives postMessage information.
-     * @param awContents   The associated {@link AwContents} of this onPostMessage() call.
      * @param message      The message from JavaScript.
      * @param sourceOrigin The origin of the frame where the message is from.
      * @param isMainframe  If the message is from a main frame.
@@ -25,6 +24,6 @@ public interface WebMessageListener {
      *                     ports to establish new communication channels. Could be empty array but
      *                     won't be null.
      */
-    void onPostMessage(AwContents awContents, String message, Uri sourceOrigin, boolean isMainFrame,
-            MessagePort replyPort, MessagePort[] ports);
+    void onPostMessage(String message, Uri sourceOrigin, boolean isMainFrame, MessagePort replyPort,
+            MessagePort[] ports);
 }

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

@@ -65,16 +65,14 @@ public class JsJavaInteractionTest {
         private LinkedBlockingQueue<Data> mQueue = new LinkedBlockingQueue<>();
 
         public static class Data {
-            public AwContents mAwContents;
             public String mMessage;
             public Uri mSourceOrigin;
             public boolean mIsMainFrame;
             public MessagePort mReplyPort;
             public MessagePort[] mPorts;
 
-            public Data(AwContents awContents, String message, Uri sourceOrigin,
-                    boolean isMainFrame, MessagePort replyPort, MessagePort[] ports) {
-                mAwContents = awContents;
+            public Data(String message, Uri sourceOrigin, boolean isMainFrame,
+                    MessagePort replyPort, MessagePort[] ports) {
                 mMessage = message;
                 mSourceOrigin = sourceOrigin;
                 mIsMainFrame = isMainFrame;
@@ -84,9 +82,9 @@ public class JsJavaInteractionTest {
         }
 
         @Override
-        public void onPostMessage(AwContents awContents, String message, Uri sourceOrigin,
-                boolean isMainFrame, MessagePort replyPort, MessagePort[] ports) {
-            mQueue.add(new Data(awContents, message, sourceOrigin, isMainFrame, replyPort, ports));
+        public void onPostMessage(String message, Uri sourceOrigin, boolean isMainFrame,
+                MessagePort replyPort, MessagePort[] ports) {
+            mQueue.add(new Data(message, sourceOrigin, isMainFrame, replyPort, ports));
         }
 
         public Data waitForOnPostMessage() throws Exception {