android: Don't pass ScopedJavaGlobalRef pointers.

content/browser/android/app_web_message_port_service_impl.cc

 // 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 "content/browser/android/app_web_message_port_service_impl.h"
 
 #include "base/android/jni_array.h"
 #include "base/android/jni_string.h"
 #include "base/bind.h"
 #include "content/browser/android/app_web_message_port_message_filter.h"
 #include "content/browser/message_port_service.h"
 #include "content/browser/renderer_host/render_process_host_impl.h"
 #include "content/browser/web_contents/web_contents_impl.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/message_port_provider.h"
 #include "jni/AppWebMessagePortService_jni.h"
 
 namespace content {
 
 using base::android::AttachCurrentThread;
 using base::android::ConvertJavaStringToUTF16;
 using base::android::ConvertUTF16ToJavaString;
 using base::android::JavaParamRef;
+using base::android::JavaRef;
 using base::android::ScopedJavaGlobalRef;
 using base::android::ScopedJavaLocalRef;
 using base::android::ToJavaIntArray;
 using content::BrowserThread;
 using content::MessagePortProvider;
 
 AppWebMessagePortServiceImpl* AppWebMessagePortServiceImpl::GetInstance() {
   return base::Singleton<AppWebMessagePortServiceImpl>::get();
 }
 
 AppWebMessagePortServiceImpl::AppWebMessagePortServiceImpl() {}
 
 AppWebMessagePortServiceImpl::~AppWebMessagePortServiceImpl() {
   JNIEnv* env = AttachCurrentThread();
   ScopedJavaLocalRef<jobject> obj = java_ref_.get(env);
   if (obj.is_null())
     return;
   Java_AppWebMessagePortService_unregisterNativeAppWebMessagePortService(env,
                                                                          obj);
 }
 
 void AppWebMessagePortServiceImpl::Init(JNIEnv* env, jobject obj) {
   java_ref_ = JavaObjectWeakGlobalRef(env, obj);
 }
 
 void AppWebMessagePortServiceImpl::CreateMessageChannel(
     JNIEnv* env,
-    jobjectArray ports,
+    const JavaRef<jobjectArray>& ports,
     WebContents* web_contents) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
   RenderFrameHostImpl* rfh =
       static_cast<RenderFrameHostImpl*>(web_contents->GetMainFrame());
   int routing_id = web_contents->GetMainFrame()->GetRoutingID();
   scoped_refptr<AppWebMessagePortMessageFilter> filter =
       rfh->GetAppWebMessagePortMessageFilter(routing_id);
-  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(&AppWebMessagePortServiceImpl::CreateMessageChannelOnIOThread,
                  base::Unretained(this), filter, portId1, portId2),
       base::Bind(&AppWebMessagePortServiceImpl::OnMessageChannelCreated,
-                 base::Unretained(this), base::Owned(j_ports),
-                 base::Owned(portId1), base::Owned(portId2)));
+                 base::Unretained(this),
+                 ScopedJavaGlobalRef<jobjectArray>(ports), base::Owned(portId1),
+                 base::Owned(portId2)));
 }
 
 void AppWebMessagePortServiceImpl::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())
@@ skipping 122 matching lines @@
   msp->Entangle(*portId1, *portId2);
   msp->Entangle(*portId2, *portId1);
 
   msp->HoldMessages(*portId1);
   msp->HoldMessages(*portId2);
   AddPort(*portId1, filter.get());
   AddPort(*portId2, filter.get());
 }
 
 void AppWebMessagePortServiceImpl::OnMessageChannelCreated(
-    ScopedJavaGlobalRef<jobjectArray>* ports,
+    const JavaRef<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_AppWebMessagePortService_onMessageChannelCreated(env, obj, *port1,
-                                                        *port2, *ports);
+                                                        *port2, ports);
 }
 
 // Adds a new port to the message port service.
 void AppWebMessagePortServiceImpl::AddPort(
     int message_port_id,
     AppWebMessagePortMessageFilter* filter) {
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
   if (ports_.count(message_port_id)) {
     NOTREACHED();
     return;
   }
   ports_[message_port_id] = filter;
 }
 
 bool RegisterAppWebMessagePortService(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }
 
 // static
 jlong InitAppWebMessagePortService(JNIEnv* env,
                                    const JavaParamRef<jobject>& obj) {
   AppWebMessagePortServiceImpl* service =
       AppWebMessagePortServiceImpl::GetInstance();
   service->Init(env, obj);
   return reinterpret_cast<intptr_t>(service);
 }
 
 }  // namespace content