Move MessagePort implementation from android_webview to content

android_webview/native/aw_message_port_service_impl.cc

Index: android_webview/native/aw_message_port_service_impl.cc
diff --git a/android_webview/native/aw_message_port_service_impl.cc b/android_webview/native/aw_message_port_service_impl.cc
deleted file mode 100644
index bc55c23bb74386ff764ca033a575f2e2d045af6c..0000000000000000000000000000000000000000
--- a/android_webview/native/aw_message_port_service_impl.cc
+++ /dev/null
@@ -1,243 +0,0 @@
-// Copyright 2015 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.
-
-#include "android_webview/native/aw_message_port_service_impl.h"
-
-#include "android_webview/browser/aw_browser_context.h"
-#include "android_webview/browser/aw_message_port_message_filter.h"
-#include "android_webview/native/aw_contents.h"
-#include "base/android/jni_array.h"
-#include "base/android/jni_string.h"
-#include "base/bind.h"
-#include "content/public/browser/browser_thread.h"
-#include "content/public/browser/message_port_provider.h"
-#include "jni/AwMessagePortService_jni.h"
-
-namespace android_webview {
-
-using base::android::AttachCurrentThread;
-using base::android::ConvertJavaStringToUTF16;
-using base::android::ConvertUTF16ToJavaString;
-using base::android::JavaParamRef;
-using base::android::ScopedJavaGlobalRef;
-using base::android::ScopedJavaLocalRef;
-using base::android::ToJavaIntArray;
-using content::BrowserThread;
-using content::MessagePortProvider;
-
-// static
-AwMessagePortServiceImpl* AwMessagePortServiceImpl::GetInstance() {
-  return static_cast<AwMessagePortServiceImpl*>(
-      AwBrowserContext::GetDefault()->GetMessagePortService());
-}
-
-AwMessagePortServiceImpl::AwMessagePortServiceImpl() {
-}
-
-AwMessagePortServiceImpl::~AwMessagePortServiceImpl() {
-  JNIEnv* env = AttachCurrentThread();
-  ScopedJavaLocalRef<jobject> obj = java_ref_.get(env);
-  if (obj.is_null())
-    return;
-  Java_AwMessagePortService_unregisterNativeAwMessagePortService(env, obj);
-}
-
-void AwMessagePortServiceImpl::Init(JNIEnv* env, jobject obj) {
-  java_ref_ = JavaObjectWeakGlobalRef(env, obj);
-}
-
-void AwMessagePortServiceImpl::CreateMessageChannel(
-    JNIEnv* env,
-    jobjectArray ports,
-    scoped_refptr<AwMessagePortMessageFilter> filter) {
-  DCHECK_CURRENTLY_ON(BrowserThread::UI);
-
-  ScopedJavaGlobalRef<jobjectArray>* j_ports =
-      new ScopedJavaGlobalRef<jobjectArray>();
-  j_ports->Reset(env, ports);
-
-  int* portId1 = new int;
-  int* portId2 = new int;
-  BrowserThread::PostTaskAndReply(
-      BrowserThread::IO,
-      FROM_HERE,
-      base::Bind(&AwMessagePortServiceImpl::CreateMessageChannelOnIOThread,
-                 base::Unretained(this),
-                 filter,
-                 portId1,
-                 portId2),
-      base::Bind(&AwMessagePortServiceImpl::OnMessageChannelCreated,
-                 base::Unretained(this),
-                 base::Owned(j_ports),
-                 base::Owned(portId1),
-                 base::Owned(portId2)));
-}
-
-void AwMessagePortServiceImpl::OnConvertedWebToAppMessage(
-    int message_port_id,
-    const base::ListValue& message,
-    const std::vector<int>& sent_message_port_ids) {
-  DCHECK_CURRENTLY_ON(BrowserThread::IO);
-  JNIEnv* env = AttachCurrentThread();
-  ScopedJavaLocalRef<jobject> jobj = java_ref_.get(env);
-  if (jobj.is_null())
-    return;
-
-  base::string16 value;
-  if (!message.GetString(0, &value)) {
-    LOG(WARNING) << "Converting post message to a string failed for port "
-        << message_port_id;
-    return;
-  }
-
-  if (message.GetSize() != 1) {
-    NOTREACHED();
-    return;
-  }
-
-  // Add the ports to AwMessagePortService.
-  for (const auto& iter : sent_message_port_ids) {
-    AddPort(iter, ports_[message_port_id]);
-  }
-
-  ScopedJavaLocalRef<jstring> jmsg = ConvertUTF16ToJavaString(env, value);
-  ScopedJavaLocalRef<jintArray> jports =
-      ToJavaIntArray(env, sent_message_port_ids);
-  Java_AwMessagePortService_onReceivedMessage(env, jobj, message_port_id, jmsg,
-                                              jports);
-}
-
-void AwMessagePortServiceImpl::OnMessagePortMessageFilterClosing(
-    AwMessagePortMessageFilter* filter) {
-  DCHECK_CURRENTLY_ON(BrowserThread::IO);
-  for (MessagePorts::iterator iter = ports_.begin();
-       iter != ports_.end(); iter++) {
-    if (iter->second == filter) {
-      ports_.erase(iter);
-    }
-  }
-}
-
-void AwMessagePortServiceImpl::PostAppToWebMessage(
-    JNIEnv* env,
-    const JavaParamRef<jobject>& obj,
-    int sender_id,
-    const JavaParamRef<jstring>& message,
-    const JavaParamRef<jintArray>& sent_ports) {
-  DCHECK_CURRENTLY_ON(BrowserThread::UI);
-  base::string16* j_message = new base::string16;
-  ConvertJavaStringToUTF16(env, message, j_message);
-  std::vector<int>* j_sent_ports = new std::vector<int>;
-  if (sent_ports != nullptr)
-    base::android::JavaIntArrayToIntVector(env, sent_ports, j_sent_ports);
-
-  BrowserThread::PostTask(
-      BrowserThread::IO,
-      FROM_HERE,
-      base::Bind(&AwMessagePortServiceImpl::PostAppToWebMessageOnIOThread,
-                 base::Unretained(this),
-                 sender_id,
-                 base::Owned(j_message),
-                 base::Owned(j_sent_ports)));
-}
-
-// The message port service cannot immediately close the port, because
-// it is possible that messages are still queued in the renderer process
-// waiting for a conversion. Instead, it sends a special message with
-// a flag which indicates that this message port should be closed.
-void AwMessagePortServiceImpl::ClosePort(JNIEnv* env,
-                                         const JavaParamRef<jobject>& obj,
-                                         int message_port_id) {
-  DCHECK_CURRENTLY_ON(BrowserThread::UI);
-  BrowserThread::PostTask(
-      BrowserThread::IO,
-      FROM_HERE,
-      base::Bind(&AwMessagePortServiceImpl::PostClosePortMessage,
-                 base::Unretained(this),
-                 message_port_id));
-}
-
-void AwMessagePortServiceImpl::ReleaseMessages(JNIEnv* env,
-                                               const JavaParamRef<jobject>& obj,
-                                               int message_port_id) {
-  DCHECK_CURRENTLY_ON(BrowserThread::UI);
-  BrowserThread::PostTask(
-      BrowserThread::IO,
-      FROM_HERE,
-      base::Bind(&MessagePortProvider::ReleaseMessages, message_port_id));
-}
-
-void AwMessagePortServiceImpl::RemoveSentPorts(
-    const std::vector<int>& sent_ports) {
-  DCHECK_CURRENTLY_ON(BrowserThread::IO);
-  // Remove the filters that are associated with the transferred ports
-  for (const auto& iter : sent_ports)
-    ports_.erase(iter);
-}
-
-void AwMessagePortServiceImpl::PostAppToWebMessageOnIOThread(
-    int sender_id,
-    base::string16* message,
-    std::vector<int>* sent_ports) {
-  RemoveSentPorts(*sent_ports);
-  ports_[sender_id]->SendAppToWebMessage(sender_id, *message, *sent_ports);
-}
-
-void AwMessagePortServiceImpl::PostClosePortMessage(int message_port_id) {
-  DCHECK_CURRENTLY_ON(BrowserThread::IO);
-  ports_[message_port_id]->SendClosePortMessage(message_port_id);
-}
-
-void AwMessagePortServiceImpl::CleanupPort(int message_port_id) {
-  DCHECK_CURRENTLY_ON(BrowserThread::IO);
-  ports_.erase(message_port_id);
-}
-
-void AwMessagePortServiceImpl::CreateMessageChannelOnIOThread(
-    scoped_refptr<AwMessagePortMessageFilter> filter,
-    int* portId1,
-    int* portId2) {
-  MessagePortProvider::CreateMessageChannel(filter.get(), portId1, portId2);
-  MessagePortProvider::HoldMessages(*portId1);
-  MessagePortProvider::HoldMessages(*portId2);
-  AddPort(*portId1, filter.get());
-  AddPort(*portId2, filter.get());
-}
-
-void AwMessagePortServiceImpl::OnMessageChannelCreated(
-    ScopedJavaGlobalRef<jobjectArray>* ports,
-    int* port1,
-    int* port2) {
-  DCHECK_CURRENTLY_ON(BrowserThread::UI);
-  JNIEnv* env = AttachCurrentThread();
-  ScopedJavaLocalRef<jobject> obj = java_ref_.get(env);
-  if (obj.is_null())
-    return;
-  Java_AwMessagePortService_onMessageChannelCreated(env, obj, *port1, *port2,
-                                                    *ports);
-}
-
-// Adds a new port to the message port service.
-void AwMessagePortServiceImpl::AddPort(int message_port_id,
-                                       AwMessagePortMessageFilter* filter) {
-  DCHECK_CURRENTLY_ON(BrowserThread::IO);
-  if (ports_.count(message_port_id)) {
-    NOTREACHED();
-    return;
-  }
-  ports_[message_port_id] = filter;
-}
-
-bool RegisterAwMessagePortService(JNIEnv* env) {
-  return RegisterNativesImpl(env);
-}
-
-// static
-jlong InitAwMessagePortService(JNIEnv* env, const JavaParamRef<jobject>& obj) {
-  AwMessagePortServiceImpl* service = AwMessagePortServiceImpl::GetInstance();
-  service->Init(env, obj);
-  return reinterpret_cast<intptr_t>(service);
-}
-
-}  // namespace android_webview