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
===================================================================
--- content/public/android/javatests/src/org/chromium/content/browser/util/TestCallbackHelperContainer.java	(revision 158071)
+++ content/public/android/javatests/src/org/chromium/content/browser/util/TestCallbackHelperContainer.java	(working copy)
@@ -12,12 +12,10 @@
  */
 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 {
@@ -87,15 +85,15 @@
     }
 
     public OnPageStartedHelper getOnPageStartedHelper() {
-        return mTestWebContentsObserver.getOnPageStartedHelper();
+        return mTestContentViewClient.getOnPageStartedHelper();
     }
 
     public OnPageFinishedHelper getOnPageFinishedHelper() {
-        return mTestWebContentsObserver.getOnPageFinishedHelper();
+        return mTestContentViewClient.getOnPageFinishedHelper();
     }
 
     public OnReceivedErrorHelper getOnReceivedErrorHelper() {
-        return mTestWebContentsObserver.getOnReceivedErrorHelper();
+        return mTestContentViewClient.getOnReceivedErrorHelper();
     }
 
     public OnEvaluateJavaScriptResultHelper getOnEvaluateJavaScriptResultHelper() {
Property changes on: content/public/android/javatests/src/org/chromium/content/browser/util/TestCallbackHelperContainer.java
___________________________________________________________________
Added: svn:mergeinfo