Revert "Updated ownership of NavigationItems within CRWSessionController."

ios/web/navigation/crw_session_controller.h

 // 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.
 
 #ifndef IOS_WEB_NAVIGATION_CRW_SESSION_CONTROLLER_H_
 #define IOS_WEB_NAVIGATION_CRW_SESSION_CONTROLLER_H_
 
 #import <Foundation/Foundation.h>
 #include <vector>
 
-#import "ios/web/navigation/navigation_item_impl_list.h"
+#include "ios/web/public/navigation_item_list.h"
 #include "ui/base/page_transition_types.h"
 #include "url/gurl.h"
 
 @class CRWSessionEntry;
 @class CRWSessionCertificatePolicyManager;
 
 namespace web {
 class BrowserState;
 class NavigationItemImpl;
 class NavigationManagerImpl;
@@ skipping 17 matching lines @@
 @property(nonatomic, copy) NSString* windowName;
 // Indicates whether the page was opened by DOM (e.g. with |window.open|
 // JavaScript call or by clicking a link with |_blank| target).
 @property(nonatomic, readonly, getter=isOpenedByDOM) BOOL openedByDOM;
 @property(nonatomic, readonly, strong)
     CRWSessionCertificatePolicyManager* sessionCertificatePolicyManager;
 @property(nonatomic, assign) NSTimeInterval lastVisitedTimestamp;
 @property(nonatomic, readonly, copy) NSString* openerId;
 @property(nonatomic, readonly, assign) NSInteger openerNavigationIndex;
 
-// The ScopedNavigationItemImplList used to store the NavigationItemImpls for
-// this session.
-@property(nonatomic, readonly) const web::ScopedNavigationItemImplList& items;
+// The list of CRWSessionEntries in |_entries|'s NavigationItemImpls.
+@property(nonatomic, readonly) web::NavigationItemList items;
 // The current NavigationItem.  During a pending navigation, returns the
 // NavigationItem for that navigation.  If a transient NavigationItem exists,
 // this NavigationItem will be returned.
 @property(nonatomic, readonly) web::NavigationItemImpl* currentItem;
 // Returns the NavigationItem whose URL should be displayed to the user.
 @property(nonatomic, readonly) web::NavigationItemImpl* visibleItem;
 // Returns the NavigationItem corresponding to a load for which no data has yet
 // been received.
 @property(nonatomic, readonly) web::NavigationItemImpl* pendingItem;
 // Returns the NavigationItem corresponding with a transient navigation (i.e.
@@ skipping 68 matching lines @@
                 transition:(ui::PageTransition)transition;
 
 // Updates the URL and state object for the current item.
 - (void)updateCurrentItemWithURL:(const GURL&)url
                      stateObject:(NSString*)stateObject;
 
 // Removes the pending and transient NavigationItems.
 - (void)discardNonCommittedItems;
 
 // Inserts history state from |otherController| to the front of |items|.  This
-// function will create copies of |otherController|'s NavigationItems.
+// function transfers ownership of |otherController|'s NavigationItems to the
+// receiver.
 - (void)insertStateFromSessionController:(CRWSessionController*)otherController;
 
 // Sets |currentNavigationIndex_| to the |index| if it's in the entries bounds.
 - (void)goToItemAtIndex:(NSInteger)index;
 
 // Removes the item at |index| after discarding any noncomitted entries.
 // |index| must not be the index of the last committed item, or a noncomitted
 // item.
 - (void)removeItemAtIndex:(NSInteger)index;
 
 // Determines whether a navigation between |firstEntry| and |secondEntry| is a
 // same-document navigation.  Entries can be passed in any order.
 - (BOOL)isSameDocumentNavigationBetweenItem:(web::NavigationItem*)firstItem
                                     andItem:(web::NavigationItem*)secondItem;
 
 // Set |useDesktopUserAgentForNextPendingItem_| to YES if there is no pending
 // entry, otherwise set |useDesktopUserAgent| in the pending entry.
 - (void)useDesktopUserAgentForNextPendingItem;
 
 // Returns the index of |item| in |items|.
 - (NSInteger)indexOfItem:(web::NavigationItem*)item;
 
 @end
 
 #endif  // IOS_WEB_NAVIGATION_CRW_SESSION_CONTROLLER_H_