Switch Android code to use ExecuteJavascriptInWebFrameCallbackResult.

content/browser/android/content_view_core_impl.cc

Index: content/browser/android/content_view_core_impl.cc
diff --git a/content/browser/android/content_view_core_impl.cc b/content/browser/android/content_view_core_impl.cc
index 174879ccda5e17343e245ffe5ae5d75d96a6e297..65b5700bd6231c0c67631a541fd5d79f5e37e5a6 100644
--- a/content/browser/android/content_view_core_impl.cc
+++ b/content/browser/android/content_view_core_impl.cc
@@ -11,6 +11,7 @@
 #include "base/json/json_writer.h"
 #include "base/logging.h"
 #include "base/utf_string_conversions.h"
+#include "base/values.h"
 #include "cc/layer.h"
 #include "content/browser/android/interstitial_page_delegate_android.h"
 #include "content/browser/android/load_url_params.h"
@@ -174,10 +175,6 @@ ContentViewCoreImpl::ContentViewCoreImpl(JNIEnv* env, jobject obj,
     dpi_scale_ = device_info->GetDPIScale();
   }
 
-  notification_registrar_.Add(this,
-                              NOTIFICATION_EXECUTE_JAVASCRIPT_RESULT,
-                              NotificationService::AllSources());
-
   // Currently, the only use case we have for overriding a user agent involves
   // spoofing a desktop Linux user agent for "Request desktop site".
   // Automatically set it for all WebContents so that it is available when a
@@ -272,25 +269,24 @@ void ContentViewCoreImpl::Observe(int type,
       }
       break;
     }
-    case NOTIFICATION_EXECUTE_JAVASCRIPT_RESULT: {
-      if (!web_contents_ || Source<RenderViewHost>(source).ptr() !=
-          web_contents_->GetRenderViewHost()) {
-        return;
-      }
+  }
+}
 
-      JNIEnv* env = base::android::AttachCurrentThread();
-      std::pair<int, Value*>* result_pair =
-          Details<std::pair<int, Value*> >(details).ptr();
-      std::string json;
-      base::JSONWriter::Write(result_pair->second, &json);
-      ScopedJavaLocalRef<jstring> j_json = ConvertUTF8ToJavaString(env, json);
-      ScopedJavaLocalRef<jobject> j_obj = java_ref_.get(env);
-      if (!j_obj.is_null()) {
-        Java_ContentViewCore_onEvaluateJavaScriptResult(env, j_obj.obj(),
-            static_cast<jint>(result_pair->first), j_json.obj());
-      }
-      break;
-    }
+void ContentViewCoreImpl::JavaScriptResultCallback(
+    ScopedJavaGlobalRef<jobject>* message,
+    const base::Value* result) {
+  // |message| is passed as base::Owned, so it will automatically be deleted
+  // when the callback goes out of scope.
+  JNIEnv* env = base::android::AttachCurrentThread();
+  std::string json;
+  base::JSONWriter::Write(result, &json);
+  ScopedJavaLocalRef<jstring> j_json = ConvertUTF8ToJavaString(env, json);
+  ScopedJavaLocalRef<jobject> j_obj = java_ref_.get(env);
+  if (!j_obj.is_null()) {
+    Java_ContentViewCore_onEvaluateJavaScriptResult(env,
+                                                    j_obj.obj(),
+                                                    j_json.obj(),
+                                                    message->obj());
   }
 }
 
@@ -1207,15 +1203,33 @@ void ContentViewCoreImpl::UndoScrollFocusedEditableNodeIntoView(
       new ViewMsg_UndoScrollFocusedEditableNodeIntoView(host->GetRoutingID()));
 }
 
-jint ContentViewCoreImpl::EvaluateJavaScript(JNIEnv* env,
+void ContentViewCoreImpl::EvaluateJavaScript(JNIEnv* env,
                                              jobject obj,
-                                             jstring script) {
+                                             jstring script,
+                                             jobject message) {
   RenderViewHost* host = web_contents_->GetRenderViewHost();
   DCHECK(host);
 
-  string16 script_utf16 = ConvertJavaStringToUTF16(env, script);
-  return host->ExecuteJavascriptInWebFrameNotifyResult(string16(),
-                                                       script_utf16);
+  if (!message) {
+    // No callback requested.
+    host->ExecuteJavascriptInWebFrame(string16(),  // frame_xpath
+                                      ConvertJavaStringToUTF16(env, script));
+    return;
+  }
+
+  // Secure the message in a scoped object and give ownership of it to the
+  // callback.
+  ScopedJavaGlobalRef<jobject>* j_message = new ScopedJavaGlobalRef<jobject>();
+  j_message->Reset(env, message);
+  content::RenderViewHost::JavascriptResultCallback callback =
+      base::Bind(&ContentViewCoreImpl::JavaScriptResultCallback,
+                 base::Unretained(this),

[joth, 2013/01/05 00:54:42]

make JavaScriptResultCallback into a static (e.g. file local anonymous
namespace) function, and then you can avoid sending "this" to it at all.

[Avi (use Gerrit), 2013/01/05 01:03:34]

JavaScriptResultCallback accesses java_ref_, so I can't split it off into a
standalone function...

(edit) oh, I see.

+                 base::Owned(j_message));
+
+  host->ExecuteJavascriptInWebFrameCallbackResult(
+      string16(),  // frame_xpath
+      ConvertJavaStringToUTF16(env, script),
+      callback);
 }
 
 bool ContentViewCoreImpl::GetUseDesktopUserAgent(
@@ -1291,12 +1305,15 @@ jint Init(JNIEnv* env, jobject obj,
   return reinterpret_cast<jint>(view);
 }
 
-jint EvaluateJavaScript(JNIEnv* env, jobject obj, jstring script) {
+void EvaluateJavaScript(JNIEnv* env,
+                        jobject obj,
+                        jstring script,
+                        jobject message) {
   ContentViewCoreImpl* view = static_cast<ContentViewCoreImpl*>(
       ContentViewCore::GetNativeContentViewCore(env, obj));
   DCHECK(view);
 
-  return view->EvaluateJavaScript(env, obj, script);
+  view->EvaluateJavaScript(env, obj, script, message);
 }
 
 bool RegisterContentViewCore(JNIEnv* env) {