Consolidate all NavigationController::LoadURL and family functions

Added public LoadUrlExtraParams struct to hold all extra parameters to the
family of LoadURL functions, were extra means not in the definition of LoadURL.

Added LoadURLWithExtraParams and removed all other load functions except
LoadURL. Updated all call sites to use the new method.

Removed NavigationControllerWebView.

BUG=


Review URL: https://chromiumcodereview.appspot.com/10830144

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@151534 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 2 insertions, 33 deletions

diff --git a/content/browser/web_contents/navigation_controller_impl.h b/content/browser/web_contents/navigation_controller_impl.h
index 8595e7d..4d87f3e 100644
--- a/content/browser/web_contents/navigation_controller_impl.h
+++ b/content/browser/web_contents/navigation_controller_impl.h
@@ -10,7 +10,6 @@
 #include "base/memory/linked_ptr.h"
 #include "base/time.h"
 #include "content/browser/ssl/ssl_manager.h"
-#include "content/public/browser/android/navigation_controller_webview.h"
 #include "content/public/browser/navigation_controller.h"
 #include "content/public/browser/navigation_type.h"
 
@@ -24,8 +23,7 @@ class SiteInstance;
 }
 
 class CONTENT_EXPORT NavigationControllerImpl
-    : public NON_EXPORTED_BASE(content::NavigationController),
-      public NON_EXPORTED_BASE(content::NavigationControllerWebView) {
+    : public NON_EXPORTED_BASE(content::NavigationController) {
  public:
   NavigationControllerImpl(
       WebContentsImpl* web_contents,
@@ -58,24 +56,7 @@ class CONTENT_EXPORT NavigationControllerImpl
                        const content::Referrer& referrer,
                        content::PageTransition type,
                        const std::string& extra_headers) OVERRIDE;
-  virtual void LoadURLFromRenderer(const GURL& url,
-                                   const content::Referrer& referrer,
-                                   content::PageTransition type,
-                                   const std::string& extra_headers) OVERRIDE;
-  virtual void LoadURLWithUserAgentOverride(
-      const GURL& url,
-      const content::Referrer& referrer,
-      content::PageTransition type,
-      bool is_renderer_initiated,
-      const std::string& extra_headers,
-      bool is_overriding_user_agent) OVERRIDE;
-  virtual void TransferURL(
-      const GURL& url,
-      const content::Referrer& referrer,
-      content::PageTransition transition,
-      const std::string& extra_headers,
-      const content::GlobalRequestID& transferred_global_request_id,
-      bool is_renderer_initiated) OVERRIDE;
+  virtual void LoadURLWithParams(const LoadURLParams& params) OVERRIDE;
   virtual void LoadIfNecessary() OVERRIDE;
   virtual bool CanGoBack() const OVERRIDE;
   virtual bool CanGoForward() const OVERRIDE;
@@ -105,18 +86,6 @@ class CONTENT_EXPORT NavigationControllerImpl
       content::NavigationController* source) OVERRIDE;
   virtual void PruneAllButActive() OVERRIDE;
 
-  // NavigationControllerWebView implementation.
-  virtual void LoadDataWithBaseURL(
-      const GURL& data_url,
-      const content::Referrer& referrer,
-      const GURL& base_url,
-      const GURL& history_url,
-      bool is_overriding_user_agent) OVERRIDE;
-  virtual void PostURL(const GURL& url,
-                       const content::Referrer& referrer,
-                       const base::RefCountedMemory& http_body,
-                       bool is_overriding_user_agent) OVERRIDE;
-
   // The session storage namespace that all child RenderViews belonging to
   // |instance| should use.
   content::SessionStorageNamespace* GetSessionStorageNamespace(