Revert 158067 - Remove native side of content_view_client

android_webview/java/src/org/chromium/android_webview/AwContentsClient.java

Index: android_webview/java/src/org/chromium/android_webview/AwContentsClient.java
===================================================================
--- android_webview/java/src/org/chromium/android_webview/AwContentsClient.java	(revision 158070)
+++ android_webview/java/src/org/chromium/android_webview/AwContentsClient.java	(working copy)
@@ -11,8 +11,6 @@
 import android.webkit.ConsoleMessage;
 
 import org.chromium.content.browser.ContentViewClient;
-import org.chromium.content.browser.ContentViewCore;
-import org.chromium.content.browser.WebContentsObserverAndroid;
 
 /**
  * Base-class that an AwContents embedder derives from to receive callbacks.
@@ -104,29 +102,6 @@
         }
     }
 
-    class WebContentsObserverAdapter extends WebContentsObserverAndroid {
-        public WebContentsObserverAdapter(ContentViewCore contentViewCore) {
-            super(contentViewCore);
-        }
-
-        @Override
-        public void didStartLoading(String url) {
-            AwContentsClient.this.onPageStarted(url);
-        }
-
-        @Override
-        public void didStopLoading(String url) {
-            AwContentsClient.this.onPageFinished(url);
-        }
-
-        @Override
-        public void didFailLoad(boolean isProvisionalLoad,
-                boolean isMainFrame, int errorCode, String description, String failingUrl) {
-            AwContentsClient.this.onReceivedError(
-                    ErrorCodeConversionHelper.convertErrorCode(errorCode), description, failingUrl);
-        }
-    }
-
     final AwWebContentsDelegate getWebContentsDelegate()  {
         return mWebContentsDelegateAdapter;
     }
@@ -165,18 +140,16 @@
     public abstract void onFindResultReceived(int activeMatchOrdinal, int numberOfMatches,
             boolean isDoneCounting);
 
-    public abstract void onPageStarted(String url);
-
-    public abstract void onPageFinished(String url);
-
-    public abstract void onReceivedError(int errorCode, String description, String failingUrl);
-
     //--------------------------------------------------------------------------------------------
     //             Stuff that we ignore since it only makes sense for Chrome browser
     //--------------------------------------------------------------------------------------------
     //
 
     @Override
+    final public void onMainFrameCommitted(String url, String baseUrl) {
+    }
+
+    @Override
     final public boolean shouldOverrideScroll(float dx, float dy, float scrollX, float scrollY) {
         return false;
     }