Merge 58701 - Relanding this:...

chrome/browser/sessions/tab_restore_service_browsertest.cc

 // Copyright (c) 2010 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 "chrome/browser/defaults.h"
 #include "chrome/browser/renderer_host/test/test_render_view_host.h"
 #include "chrome/browser/sessions/session_types.h"
 #include "chrome/browser/sessions/session_service.h"
 #include "chrome/browser/sessions/tab_restore_service.h"
 #include "chrome/browser/tab_contents/navigation_controller.h"
 #include "chrome/browser/tab_contents/navigation_entry.h"
+#include "chrome/browser/tab_contents/test_tab_contents.h"
 #include "chrome/test/render_view_test.h"
 #include "chrome/test/testing_profile.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebKit.h"
 
 // Create subclass that overrides TimeNow so that we can control the time used
 // for closed tabs and windows.
 class TabRestoreTimeFactory : public TabRestoreService::TimeFactory {
  public:
   TabRestoreTimeFactory() : time_(base::Time::Now()) {}
@@ skipping 39 matching lines @@
     // Navigate to three URLs.
     NavigateAndCommit(url1_);
     NavigateAndCommit(url2_);
     NavigateAndCommit(url3_);
   }
 
   void NavigateToIndex(int index) {
     // Navigate back. We have to do this song and dance as NavigationController
     // isn't happy if you navigate immediately while going back.
     controller().GoToIndex(index);
-    rvh()->SendNavigate(controller().pending_entry()->page_id(),
-                        controller().pending_entry()->url());
+    contents()->CommitPendingNavigation();
   }
 
   void RecreateService() {
     // Must set service to null first so that it is destroyed before the new
     // one is created.
     service_ = NULL;
     service_ = new TabRestoreService(profile(), time_factory_);
     service_->LoadTabsFromLastSession();
   }
 
@@ skipping 67 matching lines @@
 
   // There should be two entries now.
   ASSERT_EQ(2U, service_->entries().size());
 
   // Make sure the entry matches
   entry = service_->entries().front();
   ASSERT_EQ(TabRestoreService::TAB, entry->type);
   tab = static_cast<TabRestoreService::Tab*>(entry);
   EXPECT_FALSE(tab->pinned);
   ASSERT_EQ(3U, tab->navigations.size());
-  EXPECT_TRUE(url1_ == tab->navigations[0].virtual_url());
-  EXPECT_TRUE(url2_ == tab->navigations[1].virtual_url());
-  EXPECT_TRUE(url3_ == tab->navigations[2].virtual_url());
+  EXPECT_EQ(url1_, tab->navigations[0].virtual_url());
+  EXPECT_EQ(url2_, tab->navigations[1].virtual_url());
+  EXPECT_EQ(url3_, tab->navigations[2].virtual_url());
   EXPECT_EQ(1, tab->current_navigation_index);
   EXPECT_EQ(time_factory_->TimeNow().ToInternalValue(),
             tab->timestamp.ToInternalValue());
 }
 
 // Make sure TabRestoreService doesn't create an entry for a tab with no
 // navigations.
 TEST_F(TabRestoreServiceTest, DontCreateEmptyTab) {
   service_->CreateHistoricalTab(&controller());
   EXPECT_TRUE(service_->entries().empty());
@@ skipping 302 matching lines @@
   ASSERT_EQ(1U, service_->entries().size());
 
   // And verify the entry.
   TabRestoreService::Entry* restored_entry = service_->entries().front();
   ASSERT_EQ(TabRestoreService::TAB, restored_entry->type);
   TabRestoreService::Tab* restored_tab =
       static_cast<TabRestoreService::Tab*>(restored_entry);
   EXPECT_EQ(tab_timestamp.ToInternalValue(),
             restored_tab->timestamp.ToInternalValue());
 }