Rename java WebContentsObserverAndroid to WebContentsObserver

chromecast/shell/android/apk/src/org/chromium/chromecast/shell/CastWindowAndroid.java

 // Copyright 2014 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.chromecast.shell;
 
 import android.content.Context;
 import android.content.Intent;
 import android.net.Uri;
 import android.support.v4.content.LocalBroadcastManager;
 import android.text.TextUtils;
 import android.util.AttributeSet;
 import android.util.Log;
 import android.view.ViewGroup;
 import android.widget.FrameLayout;
 import android.widget.LinearLayout;
 
 import org.chromium.base.CalledByNative;
 import org.chromium.base.JNINamespace;
 import org.chromium.content.browser.ContentView;
 import org.chromium.content.browser.ContentViewCore;
 import org.chromium.content.browser.ContentViewRenderView;
-import org.chromium.content.browser.WebContentsObserverAndroid;
+import org.chromium.content.browser.WebContentsObserver;
 import org.chromium.content_public.browser.LoadUrlParams;
 import org.chromium.ui.base.WindowAndroid;
 
 /**
  * Container for the various UI components that make up a shell window.
  */
 @JNINamespace("chromecast::shell")
 public class CastWindowAndroid extends LinearLayout {
     public static final String TAG = "CastWindowAndroid";
 
     public static final String ACTION_PAGE_LOADED = "castPageLoaded";
     public static final String ACTION_ENABLE_DEV_TOOLS = "castEnableDevTools";
     public static final String ACTION_DISABLE_DEV_TOOLS = "castDisableDevTools";
 
     private ContentViewCore mContentViewCore;
     private ContentViewRenderView mContentViewRenderView;
-    private WebContentsObserverAndroid mWebContentsObserver;
+    private WebContentsObserver mWebContentsObserver;
     private WindowAndroid mWindow;
 
     /**
      * Constructor for inflating via XML.
      */
     public CastWindowAndroid(Context context, AttributeSet attrs) {
         super(context, attrs);
     }
 
     /**
@@ skipping 68 matching lines @@
         mContentViewCore.initialize(view, view, nativeWebContents, mWindow);
 
         if (getParent() != null) mContentViewCore.onShow();
         ((FrameLayout) findViewById(R.id.contentview_holder)).addView(view,
                 new FrameLayout.LayoutParams(
                         FrameLayout.LayoutParams.MATCH_PARENT,
                         FrameLayout.LayoutParams.MATCH_PARENT));
         view.requestFocus();
         mContentViewRenderView.setCurrentContentViewCore(mContentViewCore);
 
-        mWebContentsObserver = new WebContentsObserverAndroid(mContentViewCore.getWebContents()) {
+        mWebContentsObserver = new WebContentsObserver(mContentViewCore.getWebContents()) {
             @Override
             public void didStopLoading(String url) {
                 Uri intentUri = Uri.parse(mContentViewCore
                         .getOriginalUrlForActiveNavigationEntry());
                 Log.v(TAG, "Broadcast ACTION_PAGE_LOADED: scheme=" + intentUri.getScheme()
                         + ", host=" + intentUri.getHost());
                 LocalBroadcastManager.getInstance(getContext()).sendBroadcast(
                         new Intent(ACTION_PAGE_LOADED, intentUri));
             }
         };
     }
 
     /**
      * @return The {@link ViewGroup} currently shown by this Shell.
      */
     public ViewGroup getContentView() {
         return mContentViewCore.getContainerView();
     }
 
     /**
      * @return The {@link ContentViewCore} currently managing the view shown by this Shell.
      */
     public ContentViewCore getContentViewCore() {
         return mContentViewCore;
     }
 }