Revert "Revert 158067 - Remove native side of content_view_client"

content/public/android/java/src/org/chromium/content/browser/WebContentsObserverAndroid.java

Index: content/public/android/java/src/org/chromium/content/browser/WebContentsObserverAndroid.java
diff --git a/content/public/android/java/src/org/chromium/content/browser/WebContentsObserverAndroid.java b/content/public/android/java/src/org/chromium/content/browser/WebContentsObserverAndroid.java
index af16d0a8188fbdc4a2c66df2a880c76f02018d76..c88229119c331fb1a431fc614a7d5b875ca7c878 100644
--- a/content/public/android/java/src/org/chromium/content/browser/WebContentsObserverAndroid.java
+++ b/content/public/android/java/src/org/chromium/content/browser/WebContentsObserverAndroid.java
@@ -15,8 +15,8 @@ import org.chromium.base.JNINamespace;
 public abstract class WebContentsObserverAndroid {
     private int mNativeWebContentsObserverAndroid;
 
-    public WebContentsObserverAndroid(int webContentsPtr) {
-        mNativeWebContentsObserverAndroid = nativeInit(webContentsPtr);
+    public WebContentsObserverAndroid(ContentViewCore contentViewCore) {
+        mNativeWebContentsObserverAndroid = nativeInit(contentViewCore.getNativeContentViewCore());
     }
 
     /**
@@ -47,6 +47,15 @@ public abstract class WebContentsObserverAndroid {
     }
 
     /**
+     * Called when the main frame of the page has committed.
+     * @param url The validated url for the page.
+     * @param baseUrl The validated base url for the page.
+     */
+    @CalledByNative
+    public void didNavigateMainFrame(String url, String baseUrl) {
+    }
+
+    /**
      * Destroy the corresponding native object.
      */
     @CalledByNative
@@ -57,6 +66,6 @@ public abstract class WebContentsObserverAndroid {
         }
     }
 
-    private native int nativeInit(int webContentsPtr);
+    private native int nativeInit(int contentViewCorePtr);
     private native void nativeDestroy(int nativeWebContentsObserverAndroid);
 }