Factor the SSL state out of the main NavigationEntry into a helper class. This

makes it easier to find stuff and also copy ssl state (just assign).

I made one "real" change in web_contents where I copy the entire SSL state now
to the new entry rather than just a few fields like the old one. I couldn't
figure out why this was necessary: running it shows that this leaves the other
two fields in the uninitialized state which seems wrong.

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

1 files changed, 6 insertions, 4 deletions

diff --git a/chrome/browser/navigation_controller_base.cc b/chrome/browser/navigation_controller_base.cc
index f34876d..f2b921d 100644
--- a/chrome/browser/navigation_controller_base.cc
+++ b/chrome/browser/navigation_controller_base.cc
@@ -47,14 +47,14 @@ NavigationControllerBase::NavigationControllerBase()
 
 NavigationControllerBase::~NavigationControllerBase() {
   // NOTE: This does NOT invoke Reset as Reset is virtual.
-  ResetInternal();
+  //ResetInternal();
 }
 
-void NavigationControllerBase::Reset() {
+/*void NavigationControllerBase::Reset() {
   ResetInternal();
 
   last_committed_entry_index_ = -1;
-}
+}*/
 
 NavigationEntry* NavigationControllerBase::GetActiveEntry() const {
   NavigationEntry* entry = pending_entry_;
@@ -274,9 +274,11 @@ void NavigationControllerBase::DidNavigateToEntry(NavigationEntry* entry) {
     existing_entry->SetFavIconURL(entry->GetFavIconURL());
     existing_entry->SetFavIcon(entry->GetFavIcon());
     existing_entry->SetValidFavIcon(entry->IsValidFavIcon());
-    existing_entry->SetSecurityStyle(entry->GetSecurityStyle());
     existing_entry->SetContentState(entry->GetContentState());
 
+    // TODO(brettw) why only copy the security style and no other SSL stuff?
+    existing_entry->ssl().set_security_style(entry->ssl().security_style());
+
     const int prev_entry_index = last_committed_entry_index_;
     if (existing_entry == pending_entry_) {
       DCHECK(pending_entry_index_ != -1);