Consolidate ContentViewCore::Load* functions

content/public/android/java/src/org/chromium/content/browser/ContentView.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.browser;
 
 import android.content.Context;
 import android.content.res.Configuration;
 import android.graphics.Canvas;
 import android.os.Build;
@@ skipping 190 matching lines @@
 
     ContentViewClient getContentViewClient() {
         return mContentViewCore.getContentViewClient();
     }
 
     /**
      * Load url without fixing up the url string. Consumers of ContentView are responsible for
      * ensuring the URL passed in is properly formatted (i.e. the scheme has been added if left
      * off during user input).
      *
-     * @param url The url to load.
+     * @param pararms Parameters for this load.
      */
-    public void loadUrlWithoutUrlSanitization(String url) {
-        loadUrlWithoutUrlSanitization(url, PAGE_TRANSITION_TYPED);
-    }
-
-    /**
-     * Load url without fixing up the url string. Consumers of ContentView are responsible for
-     * ensuring the URL passed in is properly formatted (i.e. the scheme has been added if left
-     * off during user input).
-     *
-     * @param url The url to load.
-     * @param pageTransition Page transition id that describes the action that led to this
-     *                       navigation. It is important for ranking URLs in the history so the
-     *                       omnibox can report suggestions correctly.
-     */
-    public void loadUrlWithoutUrlSanitization(String url, int pageTransition) {
-        mContentViewCore.loadUrlWithoutUrlSanitization(url, pageTransition);
+    public void loadUrl(LoadUrlParams params) {
+        mContentViewCore.loadUrl(params);
     }
 
     void setAllUserAgentOverridesInHistory() {
         mContentViewCore.setAllUserAgentOverridesInHistory();
     }
 
     /**
      * Stops loading the current web contents.
      */
     public void stopLoading() {
@@ skipping 360 matching lines @@
 
     @Override
     public boolean super_awakenScrollBars(int startDelay, boolean invalidate) {
         return super.awakenScrollBars(startDelay, invalidate);
     }
 
     ///////////////////////////////////////////////////////////////////////////////////////////////
     //                End Implementation of ContentViewCore.InternalAccessDelegate               //
     ///////////////////////////////////////////////////////////////////////////////////////////////
 }