DidNavigate refactor of doom

chrome/browser/web_contents.h

Index: chrome/browser/web_contents.h
===================================================================
--- chrome/browser/web_contents.h	(revision 1840)
+++ chrome/browser/web_contents.h	(working copy)
@@ -66,10 +66,12 @@
   // cancel the close of the page.
   virtual void FirePageUnload();
 
-
   // TabContents
   virtual WebContents* AsWebContents() { return this; }
-  virtual bool Navigate(const NavigationEntry& entry, bool reload);
+  virtual SiteInstance* GetSiteInstance() const {
+    return render_manager_.current_host()->site_instance();
+  }
+  virtual bool NavigateToPendingEntry(bool reload);
   virtual void Stop();
   virtual void DidBecomeSelected();
   virtual void WasHidden();
@@ -243,9 +245,6 @@
   RenderViewHost* render_view_host() const {
     return render_manager_.current_host();
   }
-  SiteInstance* site_instance() const {
-    return render_manager_.current_host()->site_instance();
-  }
   RenderWidgetHostView* view() const {
     return render_manager_.current_view();
   }
@@ -329,7 +328,7 @@
   }
 
  protected:
-  FRIEND_TEST(WebContentsTest, OnMessageReceived);
+  FRIEND_TEST(WebContentsTest, UpdateTitle);
 
   // Should be deleted via CloseContents.
   virtual ~WebContents();
@@ -550,11 +549,6 @@
   //
   // These functions are helpers for Navigate() and DidNavigate().
 
-  // Creates a new navigation entry (malloced, the caller will have to free)
-  // for the given committed load. Used by DidNavigate. Will not return NULL.
-  NavigationEntry* CreateNavigationEntryForCommit(
-      const ViewHostMsg_FrameNavigate_Params& params);
-
   // Handles post-navigation tasks in DidNavigate AFTER the entry has been
   // committed to the navigation controller. Note that the navigation entry is
   // not provided since it may be invalid/changed after being committed. The
@@ -571,17 +565,6 @@
   // domain is changing.
   void MaybeCloseChildWindows(const ViewHostMsg_FrameNavigate_Params& params);
 
-  // Broadcasts a notification for the provisional load committing, used by
-  // DidNavigate.
-  void BroadcastProvisionalLoadCommit(
-      RenderViewHost* render_view_host,
-      const ViewHostMsg_FrameNavigate_Params& params);
-
-  // Convenience method that returns true if navigating to the specified URL
-  // from the current one is an in-page navigation (jumping to a ref in the
-  // page).
-  bool IsInPageNavigation(const GURL& url) const;
-
   // Updates the starred state from the bookmark bar model. If the state has
   // changed, the delegate is notified.
   void UpdateStarredStateForCurrentURL();