Created NavigationManager::CopyStateFromAndPrune().

ios/web/navigation/crw_session_controller_unittest.mm

Index: ios/web/navigation/crw_session_controller_unittest.mm
diff --git a/ios/web/navigation/crw_session_controller_unittest.mm b/ios/web/navigation/crw_session_controller_unittest.mm
index 7c7d017788ad1598d5cdca3fba267d1c5bf536d0..c760e3b26111ea54895a4b6264ac97baabb26019 100644
--- a/ios/web/navigation/crw_session_controller_unittest.mm
+++ b/ios/web/navigation/crw_session_controller_unittest.mm
@@ -505,7 +505,7 @@ void SetUp() override {
 
   // Insert and verify the state of target session controller.
   [session_controller_
-      insertStateFromSessionController:other_session_controller.get()];
+      copyStateFromSessionControllerAndPrune:other_session_controller.get()];
 
   EXPECT_EQ(2U, [session_controller_ items].size());
   EXPECT_EQ(1, [session_controller_ currentNavigationIndex]);
@@ -543,7 +543,7 @@ void SetUp() override {
 
   // Insert and verify the state of target session controller.
   [session_controller_
-      insertStateFromSessionController:other_session_controller.get()];
+      copyStateFromSessionControllerAndPrune:other_session_controller.get()];
   EXPECT_EQ(2U, [session_controller_ items].size());
   EXPECT_EQ(1, [session_controller_ currentNavigationIndex]);
   EXPECT_EQ(0, [session_controller_ previousNavigationIndex]);
@@ -555,92 +555,6 @@ void SetUp() override {
             [session_controller_ URLForItemAtIndex:1]);
 }
 
-// Tests inserting session controller state to empty session controller.

[kkhorimoto, 2017/03/15 18:28:42]

These tests are no longer needed after copying NavigationControllerImpl's
behavior around CanPruneAllButLastCommittedItem().

[Eugene But (OOO till 7-30), 2017/03/15 19:54:50]

First test checks insertion into empty SessionController. This test is still
useful, because insertion into empty session controller is handled as no op in
the new code and it should not crash.

Second tests tests that pending index is still valid, which sounds to me like a
useful thing to test.

Am I missing something here?

[kkhorimoto, 2017/03/15 21:04:38]

CanPruneAllButLastCommittedItem() returns false while there's a pending history
navigation, so it will be a no-op.  I've added tests for all three conditions in
which this will be a no-op.

-TEST_F(CRWSessionControllerTest, InsertStateToEmptySessionController) {
-  // Create source session controller with 2 committed items and one
-  // pending item.
-  base::scoped_nsobject<CRWSessionController> other_session_controller(
-      [[CRWSessionController alloc] initWithBrowserState:&browser_state_
-                                             openedByDOM:NO]);
-  [other_session_controller
-      addPendingItem:GURL("http://www.url.com/0")
-            referrer:web::Referrer()
-          transition:ui::PAGE_TRANSITION_TYPED
-      initiationType:web::NavigationInitiationType::USER_INITIATED];
-  [other_session_controller commitPendingItem];
-  [other_session_controller
-      addPendingItem:GURL("http://www.url.com/1")
-            referrer:web::Referrer()
-          transition:ui::PAGE_TRANSITION_TYPED
-      initiationType:web::NavigationInitiationType::USER_INITIATED];
-  [other_session_controller commitPendingItem];
-  [other_session_controller
-      addPendingItem:GURL("http://www.url.com/2")
-            referrer:web::Referrer()
-          transition:ui::PAGE_TRANSITION_TYPED
-      initiationType:web::NavigationInitiationType::USER_INITIATED];
-
-  // Insert and verify the state of target session controller.
-  [session_controller_
-      insertStateFromSessionController:other_session_controller.get()];
-
-  EXPECT_EQ(2U, [session_controller_ items].size());
-  EXPECT_EQ(1, [session_controller_ currentNavigationIndex]);
-  EXPECT_EQ(-1, [session_controller_ previousNavigationIndex]);
-  EXPECT_EQ(-1, [session_controller_ pendingItemIndex]);
-  EXPECT_FALSE([session_controller_ pendingItem]);
-  EXPECT_EQ(GURL("http://www.url.com/0"),
-            [session_controller_ URLForItemAtIndex:0]);
-  EXPECT_EQ(GURL("http://www.url.com/1"),
-            [session_controller_ URLForItemAtIndex:1]);
-}
-
-// Tests inserting session controller state. Verifies that pending item index
-// remains valid.
-TEST_F(CRWSessionControllerTest,
-       InsertStateWithPendingItemIndexInTargetController) {
-  // Add 2 committed items and make the first item pending.
-  [session_controller_
-      addPendingItem:GURL("http://www.url.com/2")
-            referrer:web::Referrer()
-          transition:ui::PAGE_TRANSITION_TYPED
-      initiationType:web::NavigationInitiationType::USER_INITIATED];
-  [session_controller_ commitPendingItem];
-  [session_controller_
-      addPendingItem:GURL("http://www.url.com/3")
-            referrer:web::Referrer()
-          transition:ui::PAGE_TRANSITION_TYPED
-      initiationType:web::NavigationInitiationType::USER_INITIATED];
-  [session_controller_ commitPendingItem];
-  [session_controller_ setPendingItemIndex:0];
-
-  // Create source session controller with 1 committed item.
-  base::scoped_nsobject<CRWSessionController> other_session_controller(
-      [[CRWSessionController alloc] initWithBrowserState:&browser_state_
-                                             openedByDOM:NO]);
-  [other_session_controller
-      addPendingItem:GURL("http://www.url.com/0")
-            referrer:web::Referrer()
-          transition:ui::PAGE_TRANSITION_TYPED
-      initiationType:web::NavigationInitiationType::USER_INITIATED];
-  [other_session_controller commitPendingItem];
-
-  // Insert and verify the state of target session controller.
-  [session_controller_
-      insertStateFromSessionController:other_session_controller.get()];
-
-  EXPECT_EQ(3U, [session_controller_ items].size());
-  EXPECT_EQ(2, [session_controller_ currentNavigationIndex]);
-  EXPECT_EQ(-1, [session_controller_ previousNavigationIndex]);
-  EXPECT_EQ(1, [session_controller_ pendingItemIndex]);
-  EXPECT_EQ(GURL("http://www.url.com/0"),
-            [session_controller_ URLForItemAtIndex:0]);
-  EXPECT_EQ(GURL("http://www.url.com/2"),
-            [session_controller_ URLForItemAtIndex:1]);
-  EXPECT_EQ(GURL("http://www.url.com/2"),
-            [session_controller_ pendingItem]->GetURL());
-}
-
 // Tests state of an empty session controller.
 TEST_F(CRWSessionControllerTest, EmptyController) {
   EXPECT_TRUE([session_controller_ items].empty());