Remove deprecated class WebContentsObserverAndroid and cleanup existing usages.

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

Index: chrome/android/java/src/org/chromium/chrome/browser/WebsiteSettingsPopupLegacy.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/WebsiteSettingsPopupLegacy.java b/chrome/android/java/src/org/chromium/chrome/browser/WebsiteSettingsPopupLegacy.java
index 729ed315b75aa440c55c0802b5c688646b1b3055..33fa70a02bb34174945d82d6117ea3fafd5da455 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/WebsiteSettingsPopupLegacy.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/WebsiteSettingsPopupLegacy.java
@@ -25,7 +25,7 @@ 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;
@@ -67,8 +67,8 @@ public class WebsiteSettingsPopupLegacy implements OnClickListener {
         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