Switch Android code to use ExecuteJavascriptInWebFrameCallbackResult.

content/public/test/android/javatests/src/org/chromium/content/browser/test/util/TestContentViewClient.java

Index: content/public/test/android/javatests/src/org/chromium/content/browser/test/util/TestContentViewClient.java
diff --git a/content/public/test/android/javatests/src/org/chromium/content/browser/test/util/TestContentViewClient.java b/content/public/test/android/javatests/src/org/chromium/content/browser/test/util/TestContentViewClient.java
index 64322b062f2d11ec83b9011a46eb9a824a60c5f1..b1ad650ed34c8a1cfc630826341adf3456709a6d 100644
--- a/content/public/test/android/javatests/src/org/chromium/content/browser/test/util/TestContentViewClient.java
+++ b/content/public/test/android/javatests/src/org/chromium/content/browser/test/util/TestContentViewClient.java
@@ -41,9 +41,9 @@ public class TestContentViewClient extends ContentViewClient {
      * stop working!
      */
     @Override

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

remove override. we should remove this method altogether (maybe in a follow up)

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

This was intended as a snapshot of progress. This method is already gone in my
local copy.

-    public void onEvaluateJavaScriptResult(int id, String jsonResult) {
-        super.onEvaluateJavaScriptResult(id, jsonResult);
-        mOnEvaluateJavaScriptResultHelper.notifyCalled(id, jsonResult);
+    public void onEvaluateJavaScriptResult(String jsonResult) {
+        super.onEvaluateJavaScriptResult(jsonResult);
+        mOnEvaluateJavaScriptResultHelper.notifyCalled(jsonResult);
     }
 
     @Override