DidNavigate refactor of doom

chrome/browser/back_forward_menu_model_unittest.cc

 // Copyright (c) 2006-2008 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.
 
 #include "chrome/browser/back_forward_menu_model.h"
 
 #include "base/file_util.h"
 #include "base/path_service.h"
 #include "chrome/browser/navigation_controller.h"
 #include "chrome/browser/navigation_entry.h"
@@ skipping 11 matching lines @@
 // loaded. Constructing one of these automatically constructs a
 // NavigationController instance which we wrap our RecentPagesModel around.
 class BackFwdMenuModelTestTabContents : public TabContents {
  public:
   BEGIN_MSG_MAP(BackFwdMenuModelTestTabContents)
   END_MSG_MAP()
 
   BackFwdMenuModelTestTabContents() : TabContents(kHTTPTabContentsType) {
   }
 
-  bool Navigate(const NavigationEntry& entry, bool reload) {
-    NavigationEntry* pending_entry = new NavigationEntry(entry);
-    if (pending_entry->page_id() == -1) {
-      pending_entry->set_page_id(g_page_id_++);
-    }
-    NavigationController::LoadCommittedDetails details;
-    DidNavigateToEntry(pending_entry, &details);
+  // We do the same thing as the TabContents one (just commit the navigation)
+  // but we *don't* want to reset the title since the test looks for this.
+  virtual bool NavigateToPendingEntry(bool reload) {
+    controller()->CommitPendingEntry();
     return true;
   }
 
   void UpdateState(const std::wstring& title) {
     NavigationEntry* entry =
-      controller()->GetEntryWithPageID(type(), NULL, g_page_id_ - 1);
+      controller()->GetEntryWithPageID(type(), NULL, GetMaxPageID());
     entry->set_title(title);
   }
-
- private:
-  // We need to use valid, incrementing page ids otherwise the TabContents
-  // and NavController will not play nice when we try to go back and forward.
-  static int g_page_id_;
 };
 
-int BackFwdMenuModelTestTabContents::g_page_id_ = 0;
-
 // This constructs our fake TabContents.
 class BackFwdMenuModelTestTabContentsFactory : public TabContentsFactory {
  public:
   virtual TabContents* CreateInstance() {
     return new BackFwdMenuModelTestTabContents;
   }
 
   virtual bool CanHandleURL(const GURL& url) {
     return url.scheme() == "http";
   }
@@ skipping 442 matching lines @@
     EXPECT_EQ(4, back_model.GetIndexOfNextChapterStop(3, true));
     // And try backwards as well.
     EXPECT_EQ(3, back_model.GetIndexOfNextChapterStop(4, false));
     EXPECT_EQ(1, back_model.GetIndexOfNextChapterStop(3, false));
     EXPECT_EQ(1, back_model.GetIndexOfNextChapterStop(2, false));
     EXPECT_EQ(-1, back_model.GetIndexOfNextChapterStop(1, false));
   }
   contents->CloseContents();
 }