Revert 175489

content/public/android/java/src/org/chromium/content/browser/ContentView.java

Index: content/public/android/java/src/org/chromium/content/browser/ContentView.java
===================================================================
--- content/public/android/java/src/org/chromium/content/browser/ContentView.java	(revision 175490)
+++ content/public/android/java/src/org/chromium/content/browser/ContentView.java	(working copy)
@@ -420,11 +420,17 @@
 
     /**
      * Injects the passed JavaScript code in the current page and evaluates it.
+     * Once evaluated, an asynchronous call to
+     * ContentViewClient.onJavaScriptEvaluationResult is made. Used in automation
+     * tests.
      *
+     * @return an id that is passed along in the asynchronous onJavaScriptEvaluationResult callback
      * @throws IllegalStateException If the ContentView has been destroyed.
+     *
+     * TODO(nileshagrawal): Remove this method from the public interface.
      */
-    public void evaluateJavaScript(String script) throws IllegalStateException {
-        mContentViewCore.evaluateJavaScript(script, null);
+    public int evaluateJavaScript(String script) throws IllegalStateException {
+        return mContentViewCore.evaluateJavaScript(script);
     }
 
     /**