| Index: chrome/browser/sessions/tab_restore_service_browsertest.cc
|
| diff --git a/chrome/browser/sessions/tab_restore_service_browsertest.cc b/chrome/browser/sessions/tab_restore_service_browsertest.cc
|
| index 46f91e8270db1184f5ea5cf79419ab937a9b2a17..dcbd688732b2b7336837f260a7f546e6559d5230 100644
|
| --- a/chrome/browser/sessions/tab_restore_service_browsertest.cc
|
| +++ b/chrome/browser/sessions/tab_restore_service_browsertest.cc
|
| @@ -9,7 +9,6 @@
|
| #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"
|
| @@ -69,7 +68,8 @@ class TabRestoreServiceTest : public RenderViewHostTestHarness {
|
| // 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);
|
| - contents()->CommitPendingNavigation();
|
| + rvh()->SendNavigate(controller().pending_entry()->page_id(),
|
| + controller().pending_entry()->url());
|
| }
|
|
|
| void RecreateService() {
|
| @@ -157,9 +157,9 @@ TEST_F(TabRestoreServiceTest, Basic) {
|
| tab = static_cast<TabRestoreService::Tab*>(entry);
|
| EXPECT_FALSE(tab->pinned);
|
| ASSERT_EQ(3U, tab->navigations.size());
|
| - 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_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(1, tab->current_navigation_index);
|
| EXPECT_EQ(time_factory_->TimeNow().ToInternalValue(),
|
| tab->timestamp.ToInternalValue());
|
|
|