Remove CRWSessionEntry from NavigationManagerImpl.

ios/web/navigation/navigation_manager_impl.mm

Index: ios/web/navigation/navigation_manager_impl.mm
diff --git a/ios/web/navigation/navigation_manager_impl.mm b/ios/web/navigation/navigation_manager_impl.mm
index b246e7e17e03c15ebaf0ace9fb3799b016ecf84a..3f0e6e420e8a5ffc2458c04e930afa8bdec43766 100644
--- a/ios/web/navigation/navigation_manager_impl.mm
+++ b/ios/web/navigation/navigation_manager_impl.mm
@@ -11,7 +11,6 @@
 #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"
@@ -143,9 +142,8 @@ bool AreURLsInPageNavigation(const GURL& existing_url, const GURL& new_url) {
   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 {
@@ -174,23 +172,15 @@ bool AreURLsInPageNavigation(const GURL& existing_url, const GURL& new_url) {
 }
 
 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 {
@@ -202,21 +192,19 @@ bool AreURLsInPageNavigation(const GURL& existing_url, const GURL& new_url) {
 }
 
 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() {
@@ -243,12 +231,12 @@ bool AreURLsInPageNavigation(const GURL& existing_url, const GURL& new_url) {
 }
 
 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 {
@@ -256,7 +244,7 @@ bool AreURLsInPageNavigation(const GURL& existing_url, const GURL& new_url) {
 }
 
 int NavigationManagerImpl::GetPendingItemIndex() const {
-  if ([session_controller_ pendingEntry]) {
+  if (GetPendingItem()) {
     if ([session_controller_ pendingItemIndex] != -1) {
       return [session_controller_ pendingItemIndex];
     }
@@ -268,7 +256,7 @@ bool AreURLsInPageNavigation(const GURL& existing_url, const GURL& new_url) {
 }
 
 int NavigationManagerImpl::GetLastCommittedItemIndex() const {
-  if (![[session_controller_ entries] count])
+  if (GetItems().empty())
     return -1;
   return [session_controller_ currentNavigationIndex];
 }
@@ -277,9 +265,8 @@ bool AreURLsInPageNavigation(const GURL& existing_url, const GURL& new_url) {
   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];