Rename java WebContentsObserverAndroid to WebContentsObserver

chrome/android/java/src/org/chromium/chrome/browser/WebsiteSettingsPopup.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.graphics.Color;
 import android.graphics.drawable.ColorDrawable;
 import android.text.Spannable;
 import android.text.SpannableStringBuilder;
 import android.text.style.ForegroundColorSpan;
 import android.text.style.StyleSpan;
 import android.view.Gravity;
 import android.view.LayoutInflater;
 import android.view.ViewGroup;
 import android.view.Window;
 import android.widget.LinearLayout;
 import android.widget.ScrollView;
 import android.widget.TextView;
 
 import org.chromium.base.CalledByNative;
 import org.chromium.base.CommandLine;
 import org.chromium.chrome.ChromeSwitches;
 import org.chromium.chrome.R;
-import org.chromium.content.browser.WebContentsObserverAndroid;
+import org.chromium.content.browser.WebContentsObserver;
 import org.chromium.content_public.browser.WebContents;
 
 /**
  * Java side of Android implementation of the website settings UI.
  */
 public class WebsiteSettingsPopup {
     private final Context mContext;
     private final WebContents mWebContents;
 
     // A pointer to the C++ object for this UI.
@@ skipping 31 matching lines @@
         mDialog.requestWindowFeature(Window.FEATURE_NO_TITLE);
         mDialog.setCanceledOnTouchOutside(true);
 
         // Place the dialog at the top of the screen, and remove its border.
         Window window = mDialog.getWindow();
         window.setGravity(Gravity.TOP);
         window.setBackgroundDrawable(new ColorDrawable(Color.TRANSPARENT));
 
         // This needs to come after other member initialization.
         mNativeWebsiteSettingsPopup = nativeInit(this, webContents);
-        final WebContentsObserverAndroid webContentsObserver = new WebContentsObserverAndroid(
+        final WebContentsObserver webContentsObserver = new WebContentsObserver(

[nyquist, 2014/10/14 17:15:16]

This fits on one line now.

[wajahat, 2014/10/15 07:15:22]

Done.

                 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
@@ skipping 106 matching lines @@
         } else {
             WebsiteSettingsPopupLegacy.show(context, webContents);
         }
     }
 
     private static native long nativeInit(WebsiteSettingsPopup popup,
             WebContents webContents);
 
     private native void nativeDestroy(long nativeWebsiteSettingsPopupAndroid);
 }