Remove CRWSessionEntry from NavigationManagerImpl.

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>
 
 #include "base/logging.h"
 #import "ios/web/navigation/crw_session_controller+private_constructors.h"
 #import "ios/web/navigation/crw_session_controller.h"
-#import "ios/web/navigation/crw_session_entry.h"
 #import "ios/web/navigation/navigation_item_impl.h"
 #import "ios/web/navigation/navigation_manager_delegate.h"
 #include "ios/web/navigation/navigation_manager_facade_delegate.h"
 #include "ios/web/public/load_committed_details.h"
 #import "ios/web/public/navigation_item.h"
 #import "ios/web/public/web_state/web_state.h"
 #include "ui/base/page_transition_types.h"
 
 #if !defined(__has_feature) || !__has_feature(objc_arc)
 #error "This file requires ARC support."
@@ skipping 111 matching lines @@
   if (facade_delegate_)
     facade_delegate_->OnNavigationItemChanged();
 }
 
 void NavigationManagerImpl::OnNavigationItemCommitted() {
   LoadCommittedDetails details;
   details.item = GetLastCommittedItem();
   DCHECK(details.item);
   details.previous_item_index = [session_controller_ previousNavigationIndex];
   if (details.previous_item_index >= 0) {
-    DCHECK([session_controller_ previousEntry]);
-    details.previous_url =
-        [session_controller_ previousEntry].navigationItem->GetURL();
+    DCHECK(GetPreviousItem());
+    details.previous_url = GetPreviousItem()->GetURL();
     details.is_in_page =
         AreURLsInPageNavigation(details.previous_url, details.item->GetURL());
   } else {
     details.previous_url = GURL();
     details.is_in_page = NO;
   }
 
   delegate_->OnNavigationItemCommitted(details);
 
   if (facade_delegate_) {
     facade_delegate_->OnNavigationItemCommitted(details.previous_item_index,
                                                 details.is_in_page);
   }
 }
 
 CRWSessionController* NavigationManagerImpl::GetSessionController() {
   return session_controller_;
 }
 
 void NavigationManagerImpl::LoadURL(const GURL& url,
                                     const web::Referrer& referrer,
                                     ui::PageTransition type) {
   WebState::OpenURLParams params(url, referrer,
                                  WindowOpenDisposition::CURRENT_TAB, type, NO);
   delegate_->GetWebState()->OpenURL(params);
 }
 
 NavigationItem* NavigationManagerImpl::GetLastUserItem() const {
-  CRWSessionEntry* entry = [session_controller_ lastUserEntry];
-  return [entry navigationItem];
+  return [session_controller_ lastUserItem];
 }
 
 NavigationItem* NavigationManagerImpl::GetPreviousItem() const {
-  CRWSessionEntry* entry = [session_controller_ previousEntry];
-  return [entry navigationItem];
+  return [session_controller_ previousItem];
 }
 
-std::vector<NavigationItem*> NavigationManagerImpl::GetItems() {
-  std::vector<NavigationItem*> items;
-  size_t i = 0;
-  items.resize([session_controller_ entries].count);
-  for (CRWSessionEntry* entry in [session_controller_ entries]) {
-    items[i++] = entry.navigationItem;
-  }
-  return items;
+NavigationItemList NavigationManagerImpl::GetItems() const {
+  return [session_controller_ items];
 }
 
 BrowserState* NavigationManagerImpl::GetBrowserState() const {
   return browser_state_;
 }
 
 WebState* NavigationManagerImpl::GetWebState() const {
   return delegate_->GetWebState();
 }
 
 NavigationItem* NavigationManagerImpl::GetVisibleItem() const {
-  CRWSessionEntry* entry = [session_controller_ visibleEntry];
-  return [entry navigationItem];
+  return [session_controller_ visibleItem];
 }
 
 NavigationItem* NavigationManagerImpl::GetLastCommittedItem() const {
-  CRWSessionEntry* entry = [session_controller_ lastCommittedEntry];
-  return [entry navigationItem];
+  return [session_controller_ lastCommittedItem];
 }
 
 NavigationItem* NavigationManagerImpl::GetPendingItem() const {
-  return [[session_controller_ pendingEntry] navigationItem];
+  return [session_controller_ pendingItem];
 }
 
 NavigationItem* NavigationManagerImpl::GetTransientItem() const {
-  return [[session_controller_ transientEntry] navigationItem];
+  return [session_controller_ transientItem];
 }
 
 void NavigationManagerImpl::DiscardNonCommittedItems() {
   [session_controller_ discardNonCommittedItems];
 }
 
 void NavigationManagerImpl::LoadIfNecessary() {
   // Nothing to do; iOS loads lazily.
 }
 
 void NavigationManagerImpl::LoadURLWithParams(
     const NavigationManager::WebLoadParams& params) {
   delegate_->LoadURLWithParams(params);
 }
 
 void NavigationManagerImpl::AddTransientURLRewriter(
     BrowserURLRewriter::URLRewriter rewriter) {
   DCHECK(rewriter);
   if (!transient_url_rewriters_) {
     transient_url_rewriters_.reset(
         new std::vector<BrowserURLRewriter::URLRewriter>());
   }
   transient_url_rewriters_->push_back(rewriter);
 }
 
 int NavigationManagerImpl::GetItemCount() const {
-  return [[session_controller_ entries] count];
+  return GetItems().size();
 }
 
 NavigationItem* NavigationManagerImpl::GetItemAtIndex(size_t index) const {
-  NSArray* entries = [session_controller_ entries];
-  return index < entries.count ? [entries[index] navigationItem] : nullptr;
+  NavigationItemList items = GetItems();
+  return index < items.size() ? items[index] : nullptr;
 }
 
 int NavigationManagerImpl::GetCurrentItemIndex() const {
   return [session_controller_ currentNavigationIndex];
 }
 
 int NavigationManagerImpl::GetPendingItemIndex() const {
-  if ([session_controller_ pendingEntry]) {
+  if (GetPendingItem()) {
     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])
+  if (GetItems().empty())
     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)
+  size_t idx = static_cast<size_t>(index);
+  if (idx >= GetItems().size())

[Eugene But (OOO till 7-30), 2017/02/18 01:21:38]

Do you want to file a bug and add a TODO to change RemoveItemAtIndex and accept
size_t?

[kkhorimoto, 2017/02/23 05:22:31]

One was already created; I've added TODOs in navigation_manager.h

     return false;
 
   [session_controller_ removeItemAtIndex:index];
   return true;
 }
 
 bool NavigationManagerImpl::CanGoBack() const {
   return CanGoToOffset(-1);
 }
 
@@ skipping 104 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