Consolidate ContentViewCore::Load* functions

content/shell/android/java/src/org/chromium/content_shell/Shell.java

 // Copyright (c) 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;
 import android.view.KeyEvent;
 import android.view.View;
 import android.view.inputmethod.EditorInfo;
 import android.view.inputmethod.InputMethodManager;
 import android.widget.EditText;
 import android.widget.FrameLayout;
 import android.widget.ImageButton;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 import android.widget.TextView.OnEditorActionListener;
 
 import org.chromium.base.CalledByNative;
 import org.chromium.base.JNINamespace;
 import org.chromium.content.browser.ContentView;
+import org.chromium.content.browser.LoadUrlParams;
 
 /**
  * Container for the various UI components that make up a shell window.
  */
 @JNINamespace("content")
 public class Shell extends LinearLayout {
 
     private static final long COMPLETED_PROGRESS_TIMEOUT_MS = 200;
 
     private Runnable mClearProgressRunnable = new Runnable() {
@@ skipping 74 matching lines @@
      * 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, mContentView.getUrl())) {
             mContentView.reload();
         } else {
-            mContentView.loadUrlWithoutUrlSanitization(sanitizeUrl(url));
+            LoadUrlParams params = new LoadUrlParams(sanitizeUrl(url));
+            mContentView.loadUrl(params);
         }
         mUrlTextView.clearFocus();
     }
 
     /**
      * Given an URL, this performs minimal sanitizing to ensure it will be valid.
      * @param url The url to be sanitized.
      * @return The sanitized URL.
      */
     public static String sanitizeUrl(String url) {
@@ skipping 61 matching lines @@
     private void setKeyboardVisibilityForUrl(boolean visible) {
         InputMethodManager imm = (InputMethodManager) getContext().getSystemService(
                 Context.INPUT_METHOD_SERVICE);
         if (visible) {
             imm.showSoftInput(mUrlTextView, InputMethodManager.SHOW_IMPLICIT);
         } else {
             imm.hideSoftInputFromWindow(mUrlTextView.getWindowToken(), 0);
         }
     }
 }