Consolidate all NavigationController::LoadURL and family functions

content/browser/web_contents/navigation_controller_impl.h

Index: content/browser/web_contents/navigation_controller_impl.h
diff --git a/content/browser/web_contents/navigation_controller_impl.h b/content/browser/web_contents/navigation_controller_impl.h
index a2dddb80aba0c204eb9ebee3212b4a1625737a30..7b8c53537d00f1f1b1014374e05a6f9601d00ef0 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"
 
@@ -25,8 +24,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,
@@ -60,24 +58,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(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;
-
   // Returns the index of the specified entry, or -1 if entry is not contained
   // in this NavigationController.
   int GetIndexOfEntry(const content::NavigationEntryImpl* entry) const;