Removing ContentViewCore dependencies from few functions which acts as direct wrapper to WebContents

content/shell/android/java/src/org/chromium/content_shell/Shell.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.content_shell;
 
 import android.content.Context;
 import android.graphics.drawable.ClipDrawable;
 import android.text.TextUtils;
 import android.util.AttributeSet;
@@ skipping 142 matching lines @@
                 return true;
             }
         });
         mUrlTextView.setOnFocusChangeListener(new OnFocusChangeListener() {
             @Override
             public void onFocusChange(View v, boolean hasFocus) {
                 setKeyboardVisibilityForUrl(hasFocus);
                 mNextButton.setVisibility(hasFocus ? GONE : VISIBLE);
                 mPrevButton.setVisibility(hasFocus ? GONE : VISIBLE);
                 if (!hasFocus) {
-                    mUrlTextView.setText(mContentViewCore.getUrl());
+                    mUrlTextView.setText(mContentViewCore.getWebContents().getUrl());
                 }
             }
         });
     }
 
     /**
      * Loads an URL.  This will perform minimal amounts of sanitizing of the URL to attempt to
      * make it valid.
      *
      * @param url The URL to be loaded by the shell.
      */
     public void loadUrl(String url) {
         if (url == null) return;
 
-        if (TextUtils.equals(url, mContentViewCore.getUrl())) {
+        if (TextUtils.equals(url, mContentViewCore.getWebContents().getUrl())) {
             mContentViewCore.reload(true);
         } else {
             mContentViewCore.loadUrl(new LoadUrlParams(sanitizeUrl(url)));
         }
         mUrlTextView.clearFocus();
         // TODO(aurimas): Remove this when crbug.com/174541 is fixed.
         mContentViewCore.getContainerView().clearFocus();
         mContentViewCore.getContainerView().requestFocus();
     }
 
@@ skipping 62 matching lines @@
     @SuppressWarnings("unused")
     @CalledByNative
     private void initFromNativeTabContents(long nativeWebContents) {
         Context context = getContext();
         mContentViewCore = new ContentViewCore(context);
         ContentView cv = ContentView.newInstance(context, mContentViewCore);
         mContentViewCore.initialize(cv, cv, nativeWebContents, mWindow);
         mContentViewCore.setContentViewClient(mContentViewClient);
 
         if (getParent() != null) mContentViewCore.onShow();
-        if (mContentViewCore.getUrl() != null) mUrlTextView.setText(mContentViewCore.getUrl());
+        if (mContentViewCore.getWebContents().getUrl() != null) {
+            mUrlTextView.setText(mContentViewCore.getWebContents().getUrl());
+        }
         ((FrameLayout) findViewById(R.id.contentview_holder)).addView(cv,
                 new FrameLayout.LayoutParams(
                         FrameLayout.LayoutParams.MATCH_PARENT,
                         FrameLayout.LayoutParams.MATCH_PARENT));
         cv.requestFocus();
         mContentViewRenderView.setCurrentContentViewCore(mContentViewCore);
     }
 
     /**
      * Enable/Disable navigation(Prev/Next) button if navigation is allowed/disallowed
@@ skipping 26 matching lines @@
                 Context.INPUT_METHOD_SERVICE);
         if (visible) {
             imm.showSoftInput(mUrlTextView, InputMethodManager.SHOW_IMPLICIT);
         } else {
             imm.hideSoftInputFromWindow(mUrlTextView.getWindowToken(), 0);
         }
     }
 
     private static native void nativeCloseShell(long shellPtr);
 }