Consolidate all NavigationController::LoadURL and family functions

content/browser/web_contents/navigation_controller_impl.h

 // 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.
 
 #ifndef CONTENT_BROWSER_WEB_CONTENTS_NAVIGATION_CONTROLLER_IMPL_H_
 #define CONTENT_BROWSER_WEB_CONTENTS_NAVIGATION_CONTROLLER_IMPL_H_
 
 #include "build/build_config.h"
 #include "base/compiler_specific.h"
 #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"
 
 class SessionStorageNamespaceImpl;
 struct ViewHostMsg_FrameNavigate_Params;
 class WebContentsImpl;
 
 namespace content {
 class NavigationEntryImpl;
 struct LoadCommittedDetails;
 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,
       content::BrowserContext* browser_context,
       SessionStorageNamespaceImpl* session_storage_namespace);
   virtual ~NavigationControllerImpl();
 
   // NavigationController implementation:
   virtual content::WebContents* GetWebContents() const OVERRIDE;
   virtual content::BrowserContext* GetBrowserContext() const OVERRIDE;
@@ skipping 13 matching lines @@
   virtual content::NavigationEntry* GetEntryAtIndex(int index) const OVERRIDE;
   virtual content::NavigationEntry* GetEntryAtOffset(int offset) const OVERRIDE;
   virtual void DiscardNonCommittedEntries() OVERRIDE;
   virtual content::NavigationEntry* GetPendingEntry() const OVERRIDE;
   virtual int GetPendingEntryIndex() const OVERRIDE;
   virtual content::NavigationEntry* GetTransientEntry() const OVERRIDE;
   virtual void LoadURL(const GURL& url,
                        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;
   virtual bool CanGoToOffset(int offset) const OVERRIDE;
   virtual void GoBack() OVERRIDE;
   virtual void GoForward() OVERRIDE;
   virtual void GoToIndex(int index) OVERRIDE;
   virtual void GoToOffset(int offset) OVERRIDE;
   virtual void RemoveEntryAtIndex(int index) OVERRIDE;
   virtual content::SessionStorageNamespace*
       GetSessionStorageNamespace() const OVERRIDE;
   virtual void SetMaxRestoredPageID(int32 max_id) OVERRIDE;
   virtual int32 GetMaxRestoredPageID() const OVERRIDE;
   virtual bool NeedsReload() const OVERRIDE;
   virtual void CancelPendingReload() OVERRIDE;
   virtual void ContinuePendingReload() OVERRIDE;
   virtual bool IsInitialNavigation() OVERRIDE;
   virtual void Reload(bool check_for_repost) OVERRIDE;
   virtual void ReloadIgnoringCache(bool check_for_repost) OVERRIDE;
   virtual void NotifyEntryChanged(const content::NavigationEntry* entry,
                                  int index) OVERRIDE;
   virtual void CopyStateFrom(
       const content::NavigationController& source) OVERRIDE;
   virtual void CopyStateFromAndPrune(
       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;
 
   // Return the index of the entry with the corresponding instance and page_id,
   // or -1 if not found.
   int GetEntryIndexWithPageID(content::SiteInstance* instance,
                               int32 page_id) const;
 
   // Return the entry with the corresponding instance and page_id, or NULL if
@@ skipping 216 matching lines @@
   static size_t max_entry_count_for_testing_;
 
   // If a repost is pending, its type (RELOAD or RELOAD_IGNORING_CACHE),
   // NO_RELOAD otherwise.
   ReloadType pending_reload_;
 
   DISALLOW_COPY_AND_ASSIGN(NavigationControllerImpl);
 };
 
 #endif  // CONTENT_BROWSER_WEB_CONTENTS_NAVIGATION_CONTROLLER_IMPL_H_