Remove deprecated class WebContentsObserverAndroid and cleanup existing usages.

chrome/android/java/src/org/chromium/chrome/browser/WebsiteSettingsPopupLegacy.java

 // Copyright 2013 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.chrome.browser;
 
 import android.app.Dialog;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.graphics.Color;
 import android.provider.Browser;
 import android.text.TextUtils;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.View.OnClickListener;
 import android.view.ViewGroup;
 import android.view.Window;
 import android.widget.Button;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.ScrollView;
 import android.widget.TextView;
 
 import org.chromium.base.ApiCompatibilityUtils;
 import org.chromium.base.CalledByNative;
 import org.chromium.chrome.R;
-import org.chromium.content.browser.WebContentsObserverAndroid;
+import org.chromium.content.browser.WebContentsObserver;
 import org.chromium.content_public.browser.WebContents;
 
 import java.net.URISyntaxException;
 
 /**
  * Java side of Android implementation of the website settings UI.
  */
 public class WebsiteSettingsPopupLegacy implements OnClickListener {
     private static final String HELP_URL =
             "http://www.google.com/support/chrome/bin/answer.py?answer=95617";
@@ skipping 21 matching lines @@
         mPaddingThin = (int) context.getResources().getDimension(
                 R.dimen.certificate_viewer_padding_thin);
         mContainer.setPadding(mPaddingWide, mPaddingWide + mPaddingThin, mPaddingWide,
                 mPaddingWide);
 
         mDialog = new Dialog(mContext);
         mDialog.requestWindowFeature(Window.FEATURE_NO_TITLE);
         mDialog.setCanceledOnTouchOutside(true);
         // This needs to come after other member initialization.
         mNativeWebsiteSettingsPopupLegacy = nativeInit(this, webContents);
-        final WebContentsObserverAndroid webContentsObserver =
-                new WebContentsObserverAndroid(mWebContents) {
+        final WebContentsObserver webContentsObserver =
+                new WebContentsObserver(mWebContents) {
             @Override
             public void navigationEntryCommitted() {
                 // If a navigation is committed (e.g. from in-page redirect), the data we're
                 // showing is stale so dismiss the dialog.
                 mDialog.dismiss();
             }
         };
         mDialog.setOnDismissListener(new DialogInterface.OnDismissListener() {
             @Override
             public void onDismiss(DialogInterface dialog) {
@@ skipping 154 matching lines @@
         new WebsiteSettingsPopupLegacy(context, webContents);
     }
 
     private static native long nativeInit(WebsiteSettingsPopupLegacy popup,
             WebContents webContents);
     private native void nativeDestroy(long nativeWebsiteSettingsPopupLegacyAndroid);
     private native void nativeResetCertDecisions(
             long nativeWebsiteSettingsPopupLegacyAndroid, WebContents webContents);
     private native byte[][] nativeGetCertificateChain(WebContents webContents);
 }