Updated CRWSessionController interface to use NavigationItems.

ios/web/navigation/navigation_manager_impl.mm

 // Copyright 2013 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/navigation_manager_impl.h"
 
 #include <stddef.h>
 
 #include <utility>
 
@@ skipping 68 matching lines @@
 
   [session_controller_ setNavigationManager:nullptr];
 }
 
 void NavigationManagerImpl::SetDelegate(NavigationManagerDelegate* delegate) {
   delegate_ = delegate;
 }
 
 void NavigationManagerImpl::SetBrowserState(BrowserState* browser_state) {
   browser_state_ = browser_state;
+  [session_controller_ setBrowserState:browser_state];

[Eugene But (OOO till 7-30), 2017/02/03 23:33:33]

Does it change the logic? Should this be in a separate CL?

[kkhorimoto, 2017/02/04 02:45:30]

Whoops, yes.  I'll move it to a separate CL.

 }
 
 void NavigationManagerImpl::SetSessionController(
     CRWSessionController* session_controller) {
   session_controller_.reset(session_controller);
   [session_controller_ setNavigationManager:this];
 }
 
 void NavigationManagerImpl::InitializeSession(NSString* window_name,
                                               NSString* opener_id,
@@ skipping 116 matching lines @@
 
 NavigationItem* NavigationManagerImpl::GetPendingItem() const {
   return [[session_controller_ pendingEntry] navigationItem];
 }
 
 NavigationItem* NavigationManagerImpl::GetTransientItem() const {
   return [[session_controller_ transientEntry] navigationItem];
 }
 
 void NavigationManagerImpl::DiscardNonCommittedItems() {
-  [session_controller_ discardNonCommittedEntries];
+  [session_controller_ discardNonCommittedItems];
 }
 
 void NavigationManagerImpl::LoadIfNecessary() {
   // Nothing to do; iOS loads lazily.
 }
 
 void NavigationManagerImpl::LoadURLWithParams(
     const NavigationManager::WebLoadParams& params) {
   delegate_->LoadURLWithParams(params);
 }
@@ skipping 15 matching lines @@
 NavigationItem* NavigationManagerImpl::GetItemAtIndex(size_t index) const {
   NSArray* entries = [session_controller_ entries];
   return index < entries.count ? [entries[index] navigationItem] : nullptr;
 }
 
 int NavigationManagerImpl::GetCurrentItemIndex() const {
   return [session_controller_ currentNavigationIndex];
 }
 
 int NavigationManagerImpl::GetPendingItemIndex() const {
-  if ([session_controller_ hasPendingEntry]) {
-    if ([session_controller_ pendingEntryIndex] != -1) {
-      return [session_controller_ pendingEntryIndex];
+  if ([session_controller_ pendingEntry]) {
+    if ([session_controller_ pendingItemIndex] != -1) {
+      return [session_controller_ pendingItemIndex];
     }
     // TODO(crbug.com/665189): understand why current item index is
     // returned here.
     return GetCurrentItemIndex();
   }
   return -1;
 }
 
 int NavigationManagerImpl::GetLastCommittedItemIndex() const {
   if (![[session_controller_ entries] count])
     return -1;
   return [session_controller_ currentNavigationIndex];
 }
 
 bool NavigationManagerImpl::RemoveItemAtIndex(int index) {
   if (index == GetLastCommittedItemIndex() || index == GetPendingItemIndex())
     return false;
 
   NSUInteger idx = static_cast<NSUInteger>(index);
   NSArray* entries = [session_controller_ entries];
   if (idx >= entries.count)
     return false;
 
-  [session_controller_ removeEntryAtIndex:index];
+  [session_controller_ removeItemAtIndex:index];
   return true;
 }
 
 bool NavigationManagerImpl::CanGoBack() const {
   return CanGoToOffset(-1);
 }
 
 bool NavigationManagerImpl::CanGoForward() const {
   return CanGoToOffset(1);
 }
@@ skipping 36 matching lines @@
 void NavigationManagerImpl::RemoveTransientURLRewriters() {
   transient_url_rewriters_.reset();
 }
 
 void NavigationManagerImpl::CopyState(
     NavigationManagerImpl* navigation_manager) {
   SetSessionController([navigation_manager->GetSessionController() copy]);
 }
 
 int NavigationManagerImpl::GetIndexForOffset(int offset) const {
-  int result = [session_controller_ pendingEntryIndex] == -1
+  int result = [session_controller_ pendingItemIndex] == -1
                    ? GetCurrentItemIndex()
-                   : static_cast<int>([session_controller_ pendingEntryIndex]);
+                   : static_cast<int>([session_controller_ pendingItemIndex]);
 
   if (offset < 0) {
-    if (GetTransientItem() && [session_controller_ pendingEntryIndex] == -1) {
+    if (GetTransientItem() && [session_controller_ pendingItemIndex] == -1) {
       // Going back from transient item that added to the end navigation stack
       // is a matter of discarding it as there is no need to move navigation
       // index back.
       offset++;
     }
 
     while (offset < 0 && result > 0) {
       // To stop the user getting 'stuck' on redirecting pages they weren't
       // even aware existed, it is necessary to pass over pages that would
       // immediately result in a redirect (the item *before* the redirected
       // page).
       while (result > 0 && IsRedirectItemAtIndex(result)) {
         --result;
       }
       --result;
       ++offset;
     }
     // Result may be out of bounds, so stop trying to skip redirect items and
     // simply add the remainder.
     result += offset;
     if (result > GetItemCount() /* overflow */)
       result = INT_MIN;
   } else if (offset > 0) {
-    if (GetPendingItem() && [session_controller_ pendingEntryIndex] == -1) {
+    if (GetPendingItem() && [session_controller_ pendingItemIndex] == -1) {
       // Chrome for iOS does not allow forward navigation if there is another
       // pending navigation in progress. Returning invalid index indicates that
       // forward navigation will not be allowed (and |INT_MAX| works for that).
       // This is different from other platforms which allow forward navigation
       // if pending item exist.
       // TODO(crbug.com/661858): Remove this once back-forward navigation uses
       // pending index.
       return INT_MAX;
     }
     while (offset > 0 && result < GetItemCount()) {
@@ skipping 15 matching lines @@
 }
 
 bool NavigationManagerImpl::IsRedirectItemAtIndex(int index) const {
   DCHECK_GT(index, 0);
   DCHECK_LT(index, GetItemCount());
   ui::PageTransition transition = GetItemAtIndex(index)->GetTransitionType();
   return transition & ui::PAGE_TRANSITION_IS_REDIRECT_MASK;
 }
 
 }  // namespace web