Pass ScopedJavaGlobalRef to bind() by value

content/browser/android/content_view_core_impl.cc

 // Copyright (c) 2012 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/content_view_core_impl.h"
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_array.h"
 #include "base/android/jni_string.h"
 #include "base/android/scoped_java_ref.h"
@@ skipping 1218 matching lines @@
 
 void ContentViewCoreImpl::UndoScrollFocusedEditableNodeIntoView(
     JNIEnv* env,
     jobject obj) {
   RenderViewHost* host = web_contents_->GetRenderViewHost();
   host->Send(
       new ViewMsg_UndoScrollFocusedEditableNodeIntoView(host->GetRoutingID()));
 }
 
 namespace {
-void JavaScriptResultCallback(ScopedJavaGlobalRef<jobject>* callback,
+void JavaScriptResultCallback(const ScopedJavaGlobalRef<jobject>& callback,
                               const base::Value* result) {
   // |callback| is passed as base::Owned, so it will automatically be deleted
   // when this base::Callback goes out of scope.

[Avi (use Gerrit), 2013/01/22 02:21:41]

You deleted this comment in the other file, and it seems just as obsolete here.

[joth, 2013/02/05 00:30:30]

Done.

   JNIEnv* env = base::android::AttachCurrentThread();
   std::string json;
   base::JSONWriter::Write(result, &json);
   ScopedJavaLocalRef<jstring> j_json = ConvertUTF8ToJavaString(env, json);
   Java_ContentViewCore_onEvaluateJavaScriptResult(env,
                                                   j_json.obj(),
-                                                  callback->obj());
+                                                  callback.obj());
 }
 }  // namespace
 
 void ContentViewCoreImpl::EvaluateJavaScript(JNIEnv* env,
                                              jobject obj,
                                              jstring script,
                                              jobject callback) {
   RenderViewHost* host = web_contents_->GetRenderViewHost();
   DCHECK(host);
 
   if (!callback) {
     // No callback requested.
     host->ExecuteJavascriptInWebFrame(string16(),  // frame_xpath
                                       ConvertJavaStringToUTF16(env, script));
     return;
   }
 
   // Secure the Java callback in a scoped object and give ownership of it to the
   // base::Callback.
-  ScopedJavaGlobalRef<jobject>* j_callback = new ScopedJavaGlobalRef<jobject>();
-  j_callback->Reset(env, callback);
+  ScopedJavaGlobalRef<jobject> j_callback;
+  j_callback.Reset(env, callback);
   content::RenderViewHost::JavascriptResultCallback c_callback =
-      base::Bind(&JavaScriptResultCallback, base::Owned(j_callback));
+      base::Bind(&JavaScriptResultCallback, j_callback);
 
   host->ExecuteJavascriptInWebFrameCallbackResult(
       string16(),  // frame_xpath
       ConvertJavaStringToUTF16(env, script),
       c_callback);
 }
 
 bool ContentViewCoreImpl::GetUseDesktopUserAgent(
     JNIEnv* env, jobject obj) {
   NavigationEntry* entry = web_contents_->GetController().GetActiveEntry();
@@ skipping 76 matching lines @@
   if (!HasField(env, clazz, "mNativeContentViewCore", "I")) {
     DLOG(ERROR) << "Unable to find ContentView.mNativeContentViewCore!";
     return false;
   }
   g_native_content_view = GetFieldID(env, clazz, "mNativeContentViewCore", "I");
 
   return RegisterNativesImpl(env) >= 0;
 }
 
 }  // namespace content