Revert 158067 - Remove native side of content_view_client

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

Index: content/public/android/javatests/src/org/chromium/content/browser/util/TestContentViewClient.java
===================================================================
--- content/public/android/javatests/src/org/chromium/content/browser/util/TestContentViewClient.java	(revision 158071)
+++ content/public/android/javatests/src/org/chromium/content/browser/util/TestContentViewClient.java	(working copy)
@@ -19,12 +19,30 @@
  */
 public class TestContentViewClient extends ContentViewClient {
 
+    private OnPageStartedHelper mOnPageStartedHelper;
+    private OnPageFinishedHelper mOnPageFinishedHelper;
+    private OnReceivedErrorHelper mOnReceivedErrorHelper;
     private OnEvaluateJavaScriptResultHelper mOnEvaluateJavaScriptResultHelper;
 
     public TestContentViewClient() {
+        mOnPageStartedHelper = new OnPageStartedHelper();
+        mOnPageFinishedHelper = new OnPageFinishedHelper();
+        mOnReceivedErrorHelper = new OnReceivedErrorHelper();
         mOnEvaluateJavaScriptResultHelper = new OnEvaluateJavaScriptResultHelper();
     }
 
+    public OnPageStartedHelper getOnPageStartedHelper() {
+        return mOnPageStartedHelper;
+    }
+
+    public OnPageFinishedHelper getOnPageFinishedHelper() {
+        return mOnPageFinishedHelper;
+    }
+
+    public OnReceivedErrorHelper getOnReceivedErrorHelper() {
+        return mOnReceivedErrorHelper;
+    }
+
     public OnEvaluateJavaScriptResultHelper getOnEvaluateJavaScriptResultHelper() {
         return mOnEvaluateJavaScriptResultHelper;
     }
@@ -36,6 +54,24 @@
      * stop working!
      */
     @Override
+    public void onPageStarted(String url) {
+        super.onPageStarted(url);
+        mOnPageStartedHelper.notifyCalled(url);
+    }
+
+    @Override
+    public void onPageFinished(String url) {
+        super.onPageFinished(url);
+        mOnPageFinishedHelper.notifyCalled(url);
+    }
+
+    @Override
+    public void onReceivedError(int errorCode, String description, String failingUrl) {
+        super.onReceivedError(errorCode, description, failingUrl);
+        mOnReceivedErrorHelper.notifyCalled(errorCode, description, failingUrl);
+    }
+
+    @Override
     public void onEvaluateJavaScriptResult(int id, String jsonResult) {
         super.onEvaluateJavaScriptResult(id, jsonResult);
         mOnEvaluateJavaScriptResultHelper.notifyCalled(id, jsonResult);
Property changes on: content/public/android/javatests/src/org/chromium/content/browser/util/TestContentViewClient.java
___________________________________________________________________
Added: svn:mergeinfo