Clean up brettw's checkin of r1032.

Fix a DCHECK on ssl().content_status() in web_contents.cc.

Remove the unused ResetInternal method of NavigationController.

R=brettw
Review URL: http://codereview.chromium.org/221

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@1720 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 1 insertions, 11 deletions

diff --git a/chrome/browser/navigation_controller.cc b/chrome/browser/navigation_controller.cc
index c944d99..2dfc9b3 100644
--- a/chrome/browser/navigation_controller.cc
+++ b/chrome/browser/navigation_controller.cc
@@ -850,13 +850,6 @@ void NavigationController::LoadIfNecessary() {
   NavigateToPendingEntry(false);
 }
 
-void NavigationController::ResetInternal() {
-  // WARNING: this is invoked from the destructor, be sure not to invoke any
-  // virtual methods from this.
-  entries_.clear();
-  DiscardPendingEntryInternal();
-}
-
 void NavigationController::NotifyEntryChanged(const NavigationEntry* entry,
                                               int index) {
   EntryChangedDetails det;
diff --git a/chrome/browser/navigation_controller.h b/chrome/browser/navigation_controller.h
index e43bfe1..b57700d 100644
--- a/chrome/browser/navigation_controller.h
+++ b/chrome/browser/navigation_controller.h
@@ -358,9 +358,6 @@ class NavigationController {
   // Broadcasts a notification that the given entry changed.
   void NotifyEntryChanged(const NavigationEntry* entry, int index);
 
-  // Implementation of Reset and the destructor. Deletes entries
-  void ResetInternal();
-
   // Removes the entry at the specified index.  Note that you should not remove
   // the pending entry or the last committed entry.
   void RemoveEntryAtIndex(int index);
diff --git a/chrome/browser/web_contents.cc b/chrome/browser/web_contents.cc
index 2367a9b..01cd7ae 100644
--- a/chrome/browser/web_contents.cc
+++ b/chrome/browser/web_contents.cc
@@ -1318,7 +1318,7 @@ NavigationEntry* WebContents::CreateNavigationEntryForCommit(
       // that state. We should find a better way to do this. Note that it is OK
       // that the mixed/unsafe contents is set on the wrong navigation entry, as
       // that state is reset when navigating back to it.
-      DCHECK(last_committed->ssl().content_status() == 0) << "We should never "
+      DCHECK(entry->ssl().content_status() == 0) << "We should never "
           "be setting the status bits from 1 to 0 on navigate.";
       entry->ssl() = last_committed->ssl();
     }