DidNavigate refactor of doom

chrome/browser/tabs/tab_strip_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 "base/file_util.h"
 #include "base/path_service.h"
 #include "chrome/browser/dom_ui/new_tab_ui.h"
 #include "chrome/browser/navigation_controller.h"
 #include "chrome/browser/navigation_entry.h"
 #include "chrome/browser/profile.h"
@@ skipping 13 matching lines @@
 
 // Since you can't just instantiate a TabContents, and some of its methods
 // are protected, we subclass TabContents with our own testing dummy which
 // knows how to drive the base class' NavigationController as URLs are
 // loaded.
 class TabStripModelTestTabContents : public TabContents {
  public:
   TabStripModelTestTabContents(const TabContentsType type)
       : TabContents(type) {
   }
-
-  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);
-
-    return true;
-  }
-
- 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 TabStripModelTestTabContents::g_page_id_ = 0;
 
 // This constructs our fake TabContents.
 class TabStripModelTestTabContentsFactory : public TabContentsFactory {
  public:
   virtual TabContents* CreateInstance() {
     return new TabStripModelTestTabContents(kHTTPTabContentsType);
   }
 
   virtual bool CanHandleURL(const GURL& url) {
     return url.scheme() == "http";
@@ skipping 1113 matching lines @@
 
   // Close the Tab. The next-adjacent should be selected.
   strip.CloseTabContentsAt(4);
 
   EXPECT_EQ(3, strip.selected_index());
 
   // Clean up.
   strip.CloseAllTabs();
 }