Don't update URL bar or SSL icon for pending history navs until they commit.

content/browser/tab_contents/navigation_controller_unittest.cc

 // Copyright (c) 2011 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/memory/scoped_ptr.h"
 #include "base/path_service.h"
 #include "base/stl_util.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
@@ skipping 1706 matching lines @@
   rvh()->SendNavigate(3, url3);
 
   // Add a transient and go to an entry before the current one.
   transient_entry = new NavigationEntry;
   transient_entry->set_url(transient_url);
   controller().AddTransientEntry(transient_entry);
   EXPECT_EQ(transient_url, controller().GetActiveEntry()->url());
   controller().GoToIndex(1);
   // The navigation should have been initiated, transient entry should be gone.
   EXPECT_EQ(url1, controller().GetActiveEntry()->url());
+  // Visible entry does not update for history navigations until commit.
+  EXPECT_EQ(url3, controller().GetVisibleEntry()->url());
   rvh()->SendNavigate(1, url1);
+  EXPECT_EQ(url1, controller().GetVisibleEntry()->url());
 
   // Add a transient and go to an entry after the current one.
   transient_entry = new NavigationEntry;
   transient_entry->set_url(transient_url);
   controller().AddTransientEntry(transient_entry);
   EXPECT_EQ(transient_url, controller().GetActiveEntry()->url());
   controller().GoToIndex(3);
   // The navigation should have been initiated, transient entry should be gone.
   // Because of the transient entry that is removed, going to index 3 makes us
-  // land on url2.
+  // land on url2 (which is visible after the commit).
   EXPECT_EQ(url2, controller().GetActiveEntry()->url());
+  EXPECT_EQ(url1, controller().GetVisibleEntry()->url());
   rvh()->SendNavigate(2, url2);
+  EXPECT_EQ(url2, controller().GetVisibleEntry()->url());
 
   // Add a transient and go forward.
   transient_entry = new NavigationEntry;
   transient_entry->set_url(transient_url);
   controller().AddTransientEntry(transient_entry);
   EXPECT_EQ(transient_url, controller().GetActiveEntry()->url());
   EXPECT_TRUE(controller().CanGoForward());
   controller().GoForward();
   // We should have navigated, transient entry should be gone.
   EXPECT_EQ(url3, controller().GetActiveEntry()->url());
+  EXPECT_EQ(url2, controller().GetVisibleEntry()->url());
   rvh()->SendNavigate(3, url3);
+  EXPECT_EQ(url3, controller().GetVisibleEntry()->url());
 
   // Ensure the URLS are correct.
   EXPECT_EQ(controller().entry_count(), 5);
   EXPECT_EQ(controller().GetEntryAtIndex(0)->url(), url0);
   EXPECT_EQ(controller().GetEntryAtIndex(1)->url(), url1);
   EXPECT_EQ(controller().GetEntryAtIndex(2)->url(), url2);
   EXPECT_EQ(controller().GetEntryAtIndex(3)->url(), url3);
   EXPECT_EQ(controller().GetEntryAtIndex(4)->url(), url4);
 }
 
@@ skipping 616 matching lines @@
   TabNavigation nav(0, url0, GURL(), string16(),
                     webkit_glue::CreateHistoryStateForURL(url0),
                     PageTransition::LINK);
   session_helper_.AssertNavigationEquals(nav,
                                          windows_[0]->tabs[0]->navigations[0]);
   nav.set_url(url2);
   session_helper_.AssertNavigationEquals(nav,
                                          windows_[0]->tabs[0]->navigations[1]);
 }
 */