Move MessagePort implementation from android_webview to content

android_webview/java/src/org/chromium/android_webview/AwBrowserContext.java

Index: android_webview/java/src/org/chromium/android_webview/AwBrowserContext.java
diff --git a/android_webview/java/src/org/chromium/android_webview/AwBrowserContext.java b/android_webview/java/src/org/chromium/android_webview/AwBrowserContext.java
index 95592444b78f889b9c18a8aedda5f58cb7a34dff..196568727ff289c2791c02931055b827bd50bca7 100644
--- a/android_webview/java/src/org/chromium/android_webview/AwBrowserContext.java
+++ b/android_webview/java/src/org/chromium/android_webview/AwBrowserContext.java
@@ -7,6 +7,7 @@ package org.chromium.android_webview;
 import android.content.Context;
 import android.content.SharedPreferences;
 
+import org.chromium.content.browser.AppWebMessagePortService;
 import org.chromium.content.browser.ContentViewStatics;
 
 /**
@@ -25,7 +26,7 @@ public class AwBrowserContext {
     private AwGeolocationPermissions mGeolocationPermissions;
     private AwFormDatabase mFormDatabase;
     private HttpAuthDatabase mHttpAuthDatabase;
-    private AwMessagePortService mMessagePortService;
+    private AppWebMessagePortService mMessagePortService;
     private AwMetricsServiceClient mMetricsServiceClient;
     private AwServiceWorkerController mServiceWorkerController;
     private Context mApplicationContext;
@@ -57,9 +58,9 @@ public class AwBrowserContext {
         return mHttpAuthDatabase;
     }
 
-    public AwMessagePortService getMessagePortService() {
+    public AppWebMessagePortService getMessagePortService() {
         if (mMessagePortService == null) {
-            mMessagePortService = new AwMessagePortService();
+            mMessagePortService = new AppWebMessagePortService();
         }
         return mMessagePortService;
     }