Revert "Revert 158067 - Remove native side of content_view_client"

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

Index: content/public/android/javatests/src/org/chromium/content/browser/util/TestCallbackHelperContainer.java
diff --git a/content/public/android/javatests/src/org/chromium/content/browser/util/TestCallbackHelperContainer.java b/content/public/android/javatests/src/org/chromium/content/browser/util/TestCallbackHelperContainer.java
index 250a09723dbee9b669f5b286baa917b6893b5820..43d2193291ba8ba268b2ab2f1fe9889c198e4ea5 100644
--- a/content/public/android/javatests/src/org/chromium/content/browser/util/TestCallbackHelperContainer.java
+++ b/content/public/android/javatests/src/org/chromium/content/browser/util/TestCallbackHelperContainer.java
@@ -12,10 +12,12 @@ import org.chromium.content.browser.ContentView;
  */
 public class TestCallbackHelperContainer{
     private TestContentViewClient mTestContentViewClient;
+    private TestWebContentsObserver mTestWebContentsObserver;
 
     public TestCallbackHelperContainer(ContentView contentView) {
         mTestContentViewClient = new TestContentViewClient();
         contentView.getContentViewCore().setContentViewClient(mTestContentViewClient);
+        mTestWebContentsObserver = new TestWebContentsObserver(contentView.getContentViewCore());
     }
 
     public static class OnPageFinishedHelper extends CallbackHelper {
@@ -85,15 +87,15 @@ public class TestCallbackHelperContainer{
     }
 
     public OnPageStartedHelper getOnPageStartedHelper() {
-        return mTestContentViewClient.getOnPageStartedHelper();
+        return mTestWebContentsObserver.getOnPageStartedHelper();
     }
 
     public OnPageFinishedHelper getOnPageFinishedHelper() {
-        return mTestContentViewClient.getOnPageFinishedHelper();
+        return mTestWebContentsObserver.getOnPageFinishedHelper();
     }
 
     public OnReceivedErrorHelper getOnReceivedErrorHelper() {
-        return mTestContentViewClient.getOnReceivedErrorHelper();
+        return mTestWebContentsObserver.getOnReceivedErrorHelper();
     }
 
     public OnEvaluateJavaScriptResultHelper getOnEvaluateJavaScriptResultHelper() {