Move MessagePort related functionality to SharedWebViewChromium.

Move MessagePort related functionality from WebViewChromium to
SharedWebViewChromium so the support library glue layer can avoid
depending on WebViewChromium.

Bug: 812657
Change-Id: Iacd6c0e2dd0ffd1e8307ffb06a70cb00a2a71202
Reviewed-on: https://chromium-review.googlesource.com/924207
Commit-Queue: Gustav Sennton <gsennton@chromium.org>
Reviewed-by: Bo <boliu@chromium.org>
Cr-Commit-Position: refs/heads/master@{#537422}

android_webview/glue/java/src/com/android/webview/chromium/SharedWebViewChromium.java

@@ -7,6 +7,9 @@ package com.android.webview.chromium;
 import org.chromium.android_webview.AwContents;
 import org.chromium.android_webview.WebViewChromiumRunQueue;
 import org.chromium.base.ThreadUtils;
+import org.chromium.content_public.browser.MessagePort;
+
+import java.util.concurrent.Callable;
 
 /**
  * This class contains the parts of WebViewChromium that should be shared between the webkit-glue
@@ -14,11 +17,13 @@ import org.chromium.base.ThreadUtils;
  */
 public class SharedWebViewChromium {
     private final WebViewChromiumRunQueue mRunQueue;
+    private final WebViewChromiumAwInit mAwInit;
     // The WebView wrapper for ContentViewCore and required browser compontents.
     private AwContents mAwContents;
 
-    public SharedWebViewChromium(WebViewChromiumRunQueue runQueue) {
+    public SharedWebViewChromium(WebViewChromiumRunQueue runQueue, WebViewChromiumAwInit awInit) {
         mRunQueue = runQueue;
+        mAwInit = awInit;
     }
 
     public void setAwContentsOnUiThread(AwContents awContents) {
@@ -44,6 +49,34 @@ public class SharedWebViewChromium {
         mAwContents.insertVisualStateCallback(requestId, callback);
     }
 
+    public MessagePort[] createWebMessageChannel() {
+        mAwInit.startYourEngines(true);
+        if (checkNeedsPost()) {
+            MessagePort[] ret = mRunQueue.runOnUiThreadBlocking(new Callable<MessagePort[]>() {
+                @Override
+                public MessagePort[] call() {
+                    return createWebMessageChannel();
+                }
+            });
+            return ret;
+        }
+        return mAwContents.createMessageChannel();
+    }
+
+    public void postMessageToMainFrame(
+            final String message, final String targetOrigin, final MessagePort[] sentPorts) {
+        if (checkNeedsPost()) {
+            mRunQueue.addTask(new Runnable() {
+                @Override
+                public void run() {
+                    postMessageToMainFrame(message, targetOrigin, sentPorts);
+                }
+            });
+            return;
+        }
+        mAwContents.postMessageToFrame(null, message, targetOrigin, sentPorts);
+    }
+
     protected boolean checkNeedsPost() {
         boolean needsPost = !mRunQueue.chromiumHasStarted() || !ThreadUtils.runningOnUiThread();
         if (!needsPost && mAwContents == null) {

android_webview/glue/java/src/com/android/webview/chromium/WebViewChromium.java

@@ -128,7 +128,8 @@ class WebViewChromium implements WebViewProvider, WebViewProvider.ScrollDelegate
         mFactory = factory;
         mShouldDisableThreadChecking = shouldDisableThreadChecking;
         factory.getWebViewDelegate().addWebViewAssetPath(mWebView.getContext());
-        mSharedWebViewChromium = new SharedWebViewChromium(mFactory.getRunQueue());
+        mSharedWebViewChromium =
+                new SharedWebViewChromium(mFactory.getRunQueue(), mFactory.getAwInit());
     }
 
     static void completeWindowCreation(WebView parent, WebView child) {
@@ -1353,32 +1354,14 @@ class WebViewChromium implements WebViewProvider, WebViewProvider.ScrollDelegate
 
     @Override
     public WebMessagePort[] createWebMessageChannel() {
-        mFactory.startYourEngines(true);
-        if (checkNeedsPost()) {
-            WebMessagePort[] ret = mFactory.runOnUiThreadBlocking(new Callable<WebMessagePort[]>() {
-                @Override
-                public WebMessagePort[] call() {
-                    return createWebMessageChannel();
-                }
-            });
-            return ret;
-        }
-        return WebMessagePortAdapter.fromMessagePorts(mAwContents.createMessageChannel());
+        return WebMessagePortAdapter.fromMessagePorts(
+                mSharedWebViewChromium.createWebMessageChannel());
     }
 
     @Override
     @TargetApi(Build.VERSION_CODES.M)
     public void postMessageToMainFrame(final WebMessage message, final Uri targetOrigin) {
-        if (checkNeedsPost()) {
-            mFactory.addTask(new Runnable() {
-                @Override
-                public void run() {
-                    postMessageToMainFrame(message, targetOrigin);
-                }
-            });
-            return;
-        }
-        mAwContents.postMessageToFrame(null, message.getData(), targetOrigin.toString(),
+        mSharedWebViewChromium.postMessageToMainFrame(message.getData(), targetOrigin.toString(),
                 WebMessagePortAdapter.toMessagePorts(message.getPorts()));
     }
 

android_webview/glue/java/src/com/android/webview/chromium/WebViewChromiumFactoryProvider.java

@@ -470,4 +470,8 @@ public class WebViewChromiumFactoryProvider implements WebViewFactoryProvider {
     AwBrowserContext getBrowserContextOnUiThread() {
         return mAwInit.getBrowserContextOnUiThread();
     }
+
+    WebViewChromiumAwInit getAwInit() {
+        return mAwInit;
+    }
 }