| Index: content/browser/frame_host/navigation_controller_impl_unittest.cc
|
| diff --git a/content/browser/frame_host/navigation_controller_impl_unittest.cc b/content/browser/frame_host/navigation_controller_impl_unittest.cc
|
| index d50994083b71e60041a080173b033964469a0011..002383515b72703f320944c6160924f6c322e784 100644
|
| --- a/content/browser/frame_host/navigation_controller_impl_unittest.cc
|
| +++ b/content/browser/frame_host/navigation_controller_impl_unittest.cc
|
| @@ -2793,15 +2793,11 @@ TEST_F(NavigationControllerTest, RestoreNavigate) {
|
| EXPECT_FALSE(our_controller.GetEntryAtIndex(0)->site_instance());
|
|
|
| // After navigating, we should have one entry, and it should be "pending".
|
| - // It should now have a SiteInstance and no restore_type.
|
| our_controller.GoToIndex(0);
|
| EXPECT_EQ(1, our_controller.GetEntryCount());
|
| EXPECT_EQ(our_controller.GetEntryAtIndex(0),
|
| our_controller.GetPendingEntry());
|
| EXPECT_EQ(0, our_controller.GetEntryAtIndex(0)->GetPageID());
|
| - EXPECT_EQ(NavigationEntryImpl::RESTORE_NONE,
|
| - our_controller.GetEntryAtIndex(0)->restore_type());
|
| - EXPECT_TRUE(our_controller.GetEntryAtIndex(0)->site_instance());
|
|
|
| // Timestamp should remain the same before the navigation finishes.
|
| EXPECT_EQ(timestamp, our_controller.GetEntryAtIndex(0)->GetTimestamp());
|
| @@ -2870,15 +2866,11 @@ TEST_F(NavigationControllerTest, RestoreNavigateAfterFailure) {
|
| EXPECT_FALSE(our_controller.GetEntryAtIndex(0)->site_instance());
|
|
|
| // After navigating, we should have one entry, and it should be "pending".
|
| - // It should now have a SiteInstance and no restore_type.
|
| our_controller.GoToIndex(0);
|
| EXPECT_EQ(1, our_controller.GetEntryCount());
|
| EXPECT_EQ(our_controller.GetEntryAtIndex(0),
|
| our_controller.GetPendingEntry());
|
| EXPECT_EQ(0, our_controller.GetEntryAtIndex(0)->GetPageID());
|
| - EXPECT_EQ(NavigationEntryImpl::RESTORE_NONE,
|
| - our_controller.GetEntryAtIndex(0)->restore_type());
|
| - EXPECT_TRUE(our_controller.GetEntryAtIndex(0)->site_instance());
|
|
|
| // This pending navigation may have caused a different navigation to fail,
|
| // which causes the pending entry to be cleared.
|
|
|