Revert 175489

content/browser/android/content_view_core_impl.cc

Index: content/browser/android/content_view_core_impl.cc
===================================================================
--- content/browser/android/content_view_core_impl.cc	(revision 175490)
+++ content/browser/android/content_view_core_impl.cc	(working copy)
@@ -11,7 +11,6 @@
 #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"
@@ -175,6 +174,10 @@
     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
@@ -269,6 +272,25 @@
       }
       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;
+    }
   }
 }
 
@@ -1219,46 +1241,15 @@
       new ViewMsg_UndoScrollFocusedEditableNodeIntoView(host->GetRoutingID()));
 }
 
-namespace {
-void 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);
-  Java_ContentViewCore_onEvaluateJavaScriptResult(env,
-                                                  j_json.obj(),
-                                                  message->obj());
-}
-}  // namespace
-
-void ContentViewCoreImpl::EvaluateJavaScript(JNIEnv* env,
+jint ContentViewCoreImpl::EvaluateJavaScript(JNIEnv* env,
                                              jobject obj,
-                                             jstring script,
-                                             jobject message) {
+                                             jstring script) {
   RenderViewHost* host = web_contents_->GetRenderViewHost();
   DCHECK(host);
 
-  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(&JavaScriptResultCallback, base::Owned(j_message));
-
-  host->ExecuteJavascriptInWebFrameCallbackResult(
-      string16(),  // frame_xpath
-      ConvertJavaStringToUTF16(env, script),
-      callback);
+  string16 script_utf16 = ConvertJavaStringToUTF16(env, script);
+  return host->ExecuteJavascriptInWebFrameNotifyResult(string16(),
+                                                       script_utf16);
 }
 
 bool ContentViewCoreImpl::GetUseDesktopUserAgent(
@@ -1334,6 +1325,14 @@
   return reinterpret_cast<jint>(view);
 }
 
+jint EvaluateJavaScript(JNIEnv* env, jobject obj, jstring script) {
+  ContentViewCoreImpl* view = static_cast<ContentViewCoreImpl*>(
+      ContentViewCore::GetNativeContentViewCore(env, obj));
+  DCHECK(view);
+
+  return view->EvaluateJavaScript(env, obj, script);
+}
+
 bool RegisterContentViewCore(JNIEnv* env) {
   if (!base::android::HasClass(env, kContentViewCoreClassPath)) {
     DLOG(ERROR) << "Unable to find class ContentViewCore!";