Revert 175489

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
===================================================================
--- content/public/test/android/javatests/src/org/chromium/content/browser/test/util/TestContentViewClient.java	(revision 175490)
+++ content/public/test/android/javatests/src/org/chromium/content/browser/test/util/TestContentViewClient.java	(working copy)
@@ -35,11 +35,16 @@
     }
 
     /**
-     * ATTENTION!: When overriding the following method, be sure to call
-     * the corresponding method in the super class. Otherwise
+     * ATTENTION!: When overriding the following methods, be sure to call
+     * the corresponding methods in the super class. Otherwise
      * {@link CallbackHelper#waitForCallback()} methods will
      * stop working!
      */
+    @Override
+    public void onEvaluateJavaScriptResult(int id, String jsonResult) {
+        super.onEvaluateJavaScriptResult(id, jsonResult);
+        mOnEvaluateJavaScriptResultHelper.notifyCalled(id, jsonResult);
+    }
 
     @Override
     public void onStartContentIntent(Context context, String contentUrl) {
Property changes on: content/public/test/android/javatests/src/org/chromium/content/browser/test/util/TestContentViewClient.java
___________________________________________________________________
Deleted: svn:mergeinfo