Revert 19923 - Merge r15950....

chrome/browser/tab_contents/navigation_controller.h

 // 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.
 
 #ifndef CHROME_BROWSER_TAB_CONTENTS_NAVIGATION_CONTROLLER_H_
 #define CHROME_BROWSER_TAB_CONTENTS_NAVIGATION_CONTROLLER_H_
 
 #include <map>
 
 #include "build/build_config.h"
@@ skipping 457 matching lines @@
 
   // Cancel the collection of the TabContents allocated for |tc|. This method
   // is used when we keep using a TabContents because a provisional load failed.
   void CancelTabContentsCollection(TabContentsType t);
 
   // Invoked after session/tab restore or cloning a tab. Resets the transition
   // type of the entries, updates the max page id and creates the active
   // contents.
   void FinishRestore(int selected_index);
 
-  // Inserts a new entry or replaces the current entry with a new one, removing
-  // all entries after it. The new entry will become the active one.
-  void InsertOrReplaceEntry(NavigationEntry* entry, bool replace);
+  // Inserts an entry after the current position, removing all entries after it.
+  // The new entry will become the active one.
+  void InsertEntry(NavigationEntry* entry);
 
   // Discards the pending and transient entries without updating
   // active_contents_.
   void DiscardNonCommittedEntriesInternal();
 
   // Discards the transient entry without updating active_contents_.
   void DiscardTransientEntry();
 
   // ---------------------------------------------------------------------------
 
@@ skipping 70 matching lines @@
   // when testing.
   static bool check_for_repost_;
 
   // The maximum number of entries that a navigation controller can store.
   static size_t max_entry_count_;
 
   DISALLOW_COPY_AND_ASSIGN(NavigationController);
 };
 
 #endif  // CHROME_BROWSER_TAB_CONTENTS_NAVIGATION_CONTROLLER_H_