Switch Android code to use ExecuteJavascriptInWebFrameCallbackResult.

content/browser/android/content_view_core_impl.h

Index: content/browser/android/content_view_core_impl.h
diff --git a/content/browser/android/content_view_core_impl.h b/content/browser/android/content_view_core_impl.h
index 111e0d3b3334f814c7c8aaa179216ad4fd1c0472..9899a177f52b92e046e6a256fdc2fc47da7f67c7 100644
--- a/content/browser/android/content_view_core_impl.h
+++ b/content/browser/android/content_view_core_impl.h
@@ -24,6 +24,10 @@
 
 struct WebMenuItem;
 
+namespace base {
+class Value;
+}
+
 namespace ui {
 class WindowAndroid;
 }
@@ -156,7 +160,10 @@ class ContentViewCoreImpl : public ContentViewCore,
   void ContinuePendingReload(JNIEnv* env, jobject obj);
   jboolean NeedsReload(JNIEnv* env, jobject obj);
   void ClearHistory(JNIEnv* env, jobject obj);
-  jint EvaluateJavaScript(JNIEnv* env, jobject obj, jstring script);
+  void EvaluateJavaScript(JNIEnv* env,
+                          jobject obj,
+                          jstring script,
+                          jobject message);
   int GetNativeImeAdapter(JNIEnv* env, jobject obj);
   void SetFocus(JNIEnv* env, jobject obj, jboolean focused);
   void ScrollFocusedEditableNodeIntoView(JNIEnv* env, jobject obj);
@@ -259,6 +266,10 @@ class ContentViewCoreImpl : public ContentViewCore,
                        const NotificationSource& source,
                        const NotificationDetails& details) OVERRIDE;
 
+  // Notification that Javascript execution is complete.

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

probably should be in  "Other private methods and data" section below

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

Done.

+  void JavaScriptResultCallback(ScopedJavaGlobalRef<jobject>* message,
+                                const base::Value* result);
+
   // --------------------------------------------------------------------------
   // Other private methods and data
   // --------------------------------------------------------------------------