Created NavigationManager::CopyStateFromAndPrune().

ios/web/navigation/crw_session_controller.mm

 // Copyright 2012 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.
 
 #import "ios/web/navigation/crw_session_controller.h"
 
 #include <stddef.h>
 
 #include <algorithm>
 #include <utility>
@@ skipping 134 matching lines @@
   }
 }
 
 - (void)setPendingItemIndex:(NSInteger)pendingItemIndex {
   DCHECK_GE(pendingItemIndex, -1);
   DCHECK_LT(pendingItemIndex, static_cast<NSInteger>(self.items.size()));
   _pendingItemIndex = pendingItemIndex;
   DCHECK(_pendingItemIndex == -1 || self.pendingItem);
 }
 
+- (BOOL)canPruneAllButLastCommittedItem {
+  return self.currentNavigationIndex != -1 && self.pendingItemIndex == -1 &&
+         !self.transientItem;
+}
+
 - (const web::ScopedNavigationItemImplList&)items {
   return _items;
 }
 
 - (web::NavigationItemImpl*)currentItem {
   if (self.transientItem)
     return self.transientItem;
   if (self.pendingItem)
     return self.pendingItem;
   return self.lastCommittedItem;
@@ skipping 314 matching lines @@
 - (void)discardNonCommittedItems {
   [self discardTransientItem];
   _pendingItem.reset();
   self.pendingItemIndex = -1;
 }
 
 - (void)discardTransientItem {
   _transientItem.reset();
 }
 
-- (void)insertStateFromSessionController:(CRWSessionController*)sourceSession {
-  DCHECK(sourceSession);
+- (void)copyStateFromSessionControllerAndPrune:(CRWSessionController*)source {
+  DCHECK(source);
+  if (!self.canPruneAllButLastCommittedItem)
+    return;
 
   // The other session may not have any items, in which case there is nothing
-  // to insert.  The other session's currentItem will be bogus in such cases, so
-  // ignore it and return early.
-  web::ScopedNavigationItemImplList& sourceItems = sourceSession->_items;
+  // to insert.
+  const web::ScopedNavigationItemImplList& sourceItems = source->_items;
   if (sourceItems.empty())
     return;
 
-  // Cycle through the items from the other session and insert them before any
-  // items from this session.  Do not copy anything that comes after the other
-  // session's current item.
-  NSInteger lastIndexToCopy = sourceSession.currentNavigationIndex;
-  for (NSInteger i = 0; i <= lastIndexToCopy; ++i) {
-    std::unique_ptr<web::NavigationItemImpl> sourceItemCopy =
-        base::MakeUnique<web::NavigationItemImpl>(*sourceItems[i]);
-    _items.insert(_items.begin() + i, std::move(sourceItemCopy));
+  // Early return if there's no committed source item.
+  if (!source.lastCommittedItem)
+    return;

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

Can we even get here? if there is no |lastCommittedItem| then
|self.currentNavigationIndex| will be -1 and |canPruneAllButLastCommittedItem|
will return NO, unless I'm missing something.

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

We're checking |canPruneAllButLastCommittedItem| on |self|, but we're checking
|source| here.  As far as I can tell, our current codebase never has an instance
where the item count is non-zero (condition above), but the current navigation
index is -1, but it's still technically possible given the CRWSessionController
interface.

+
+  // Copy |sourceItems| into a new NavigationItemList.
+  DCHECK_GT(source.currentNavigationIndex, -1);
+  size_t sourceCurrentIndex =
+      static_cast<size_t>(source.currentNavigationIndex);
+  web::ScopedNavigationItemImplList mergedItems(sourceCurrentIndex + 2);

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

Why +2 ?

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

Big enough for |source|'s session up to and including the current item
(|sourceCurrentIndex| + 1), plus |self|'s current item ( + 1).  I've added a
comment.

+  for (size_t index = 0; index <= sourceCurrentIndex; ++index) {
+    mergedItems[index] =
+        base::MakeUnique<web::NavigationItemImpl>(*sourceItems[index]);
   }
+  mergedItems.back() = std::move(_items[self.currentNavigationIndex]);
+
+  // Use |mergedItems| as the session history.
+  std::swap(mergedItems, _items);
 
   // Update state to reflect inserted NavigationItems.
   _previousNavigationIndex = -1;
-  _currentNavigationIndex += lastIndexToCopy + 1;
-  if (self.pendingItemIndex != -1)
-    self.pendingItemIndex += lastIndexToCopy + 1;
+  _currentNavigationIndex = self.items.size() - 1;
 
   DCHECK_LT(static_cast<NSUInteger>(_currentNavigationIndex),
             self.items.size());
-  DCHECK(self.pendingItemIndex == -1 || self.pendingItem);
 }
 
 - (void)goToItemAtIndex:(NSInteger)index {
   if (index < 0 || static_cast<NSUInteger>(index) >= self.items.size())
     return;
 
   if (index < _currentNavigationIndex) {
     // Going back.
     [self discardNonCommittedItems];
   } else if (_currentNavigationIndex < index) {
@@ skipping 97 matching lines @@
   return item;
 }
 
 - (BOOL)isRedirectTransitionForItemAtIndex:(size_t)index {
   DCHECK_LT(index, self.items.size());
   ui::PageTransition transition = self.items[index]->GetTransitionType();
   return (transition & ui::PAGE_TRANSITION_IS_REDIRECT_MASK) ? YES : NO;
 }
 
 @end