[android_webview] Factor AwWebContentsObserver out of AwContentsClient.

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

 // Copyright 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 package org.chromium.android_webview;
 
 import android.content.pm.ActivityInfo;
 import android.graphics.Bitmap;
 import android.graphics.Picture;
 import android.net.http.SslError;
 import android.os.Looper;
 import android.os.Message;
 import android.view.KeyEvent;
 import android.view.View;
 import android.webkit.ConsoleMessage;
 import android.webkit.GeolocationPermissions;
 import android.webkit.ValueCallback;
 import android.webkit.WebChromeClient;
 
 import org.chromium.android_webview.permission.AwPermissionRequest;
-import org.chromium.content.browser.WebContentsObserverAndroid;
-import org.chromium.content_public.browser.WebContents;
-import org.chromium.net.NetError;
 
 import java.security.Principal;
 import java.util.HashMap;
 
 /**
  * Base-class that an AwContents embedder derives from to receive callbacks.
  * This extends ContentViewClient, as in many cases we want to pass-thru ContentViewCore
  * callbacks right to our embedder, and this setup facilities that.
  * For any other callbacks we need to make transformations of (e.g. adapt parameters
  * or perform filtering) we can provide final overrides for methods here, and then introduce
  * new abstract methods that the our own client must implement.
  * i.e.: all methods in this class should either be final, or abstract.
  */
 public abstract class AwContentsClient {
 
     private final AwContentsClientCallbackHelper mCallbackHelper;
 
-    private AwWebContentsObserver mWebContentsObserver;
-
     // Last background color reported from the renderer. Holds the sentinal value INVALID_COLOR
     // if not valid.
     private int mCachedRendererBackgroundColor = INVALID_COLOR;
 
     private static final int INVALID_COLOR = 0;
 
     public AwContentsClient() {
         this(Looper.myLooper());
     }
 
     // Alllow injection of the callback thread, for testing.
     public AwContentsClient(Looper looper) {
         mCallbackHelper = new AwContentsClientCallbackHelper(looper, this);
     }
 
-    class AwWebContentsObserver extends WebContentsObserverAndroid {
-        public AwWebContentsObserver(WebContents webContents) {
-            super(webContents);
-        }
-
-        @Override
-        public void didFinishLoad(long frameId, String validatedUrl, boolean isMainFrame) {
-            String unreachableWebDataUrl = AwContentsStatics.getUnreachableWebDataUrl();
-            boolean isErrorUrl =
-                    unreachableWebDataUrl != null && unreachableWebDataUrl.equals(validatedUrl);
-            if (isMainFrame && !isErrorUrl) {
-                AwContentsClient.this.onPageFinished(validatedUrl);
-            }
-        }
-
-        @Override
-        public void didFailLoad(boolean isProvisionalLoad,
-                boolean isMainFrame, int errorCode, String description, String failingUrl) {
-            String unreachableWebDataUrl = AwContentsStatics.getUnreachableWebDataUrl();
-            boolean isErrorUrl =
-                    unreachableWebDataUrl != null && unreachableWebDataUrl.equals(failingUrl);
-            if (isMainFrame && !isErrorUrl) {
-                if (errorCode != NetError.ERR_ABORTED) {
-                    // This error code is generated for the following reasons:
-                    // - WebView.stopLoading is called,
-                    // - the navigation is intercepted by the embedder via shouldOverrideNavigation.
-                    //
-                    // The Android WebView does not notify the embedder of these situations using
-                    // this error code with the WebViewClient.onReceivedError callback.
-                    AwContentsClient.this.onReceivedError(
-                            ErrorCodeConversionHelper.convertErrorCode(errorCode), description,
-                                    failingUrl);
-                }
-                // Need to call onPageFinished after onReceivedError (if there is an error) for
-                // backwards compatibility with the classic webview.
-                AwContentsClient.this.onPageFinished(failingUrl);
-            }
-        }
-
-        @Override
-        public void didNavigateMainFrame(String url, String baseUrl,
-                boolean isNavigationToDifferentPage, boolean isFragmentNavigation) {
-            // This is here to emulate the Classic WebView firing onPageFinished for main frame
-            // navigations where only the hash fragment changes.
-            if (isFragmentNavigation) {
-                AwContentsClient.this.onPageFinished(url);
-            }
-        }
-
-        @Override
-        public void didNavigateAnyFrame(String url, String baseUrl, boolean isReload) {
-            AwContentsClient.this.doUpdateVisitedHistory(url, isReload);
-        }
-
-    }
-
-    final void installWebContentsObserver(WebContents webContents) {
-        if (mWebContentsObserver != null) {
-            mWebContentsObserver.detachFromWebContents();
-        }
-        mWebContentsObserver = new AwWebContentsObserver(webContents);
-    }
-
     final AwContentsClientCallbackHelper getCallbackHelper() {
         return mCallbackHelper;
     }
 
     final int getCachedRendererBackgroundColor() {
         assert isCachedRendererBackgroundColorValid();
         return mCachedRendererBackgroundColor;
     }
 
     final boolean isCachedRendererBackgroundColorValid() {
@@ skipping 145 matching lines @@
     public abstract void onFindResultReceived(int activeMatchOrdinal, int numberOfMatches,
             boolean isDoneCounting);
 
     /**
      * Called whenever there is a new content picture available.
      * @param picture New picture.
      */
     public abstract void onNewPicture(Picture picture);
 
 }