Updated CRWSessionController interface to use NavigationItems.

ios/web/navigation/crw_session_controller_unittest.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"
 
 #import <Foundation/Foundation.h>
 
 #include <utility>
 
@@ skipping 55 matching lines @@
 TEST_F(CRWSessionControllerTest, InitWithWindowName) {
   EXPECT_NSEQ(@"test window", [session_controller_ windowName]);
   EXPECT_NSEQ(@"opener", [session_controller_ openerId]);
   EXPECT_FALSE([session_controller_ isOpenedByDOM]);
   EXPECT_EQ(0U, [[session_controller_ entries] count]);
   EXPECT_EQ(nil, [session_controller_ currentEntry]);
 }
 
 // Tests session controller state after setting a pending index.
 TEST_F(CRWSessionControllerTest, SetPendingIndex) {
-  [session_controller_ addPendingEntry:GURL("http://www.example.com")
-                              referrer:web::Referrer()
-                            transition:ui::PAGE_TRANSITION_TYPED
-                     rendererInitiated:NO];
-  [session_controller_ commitPendingEntry];
+  [session_controller_ addPendingItem:GURL("http://www.example.com")
+                             referrer:web::Referrer()
+                           transition:ui::PAGE_TRANSITION_TYPED
+                    rendererInitiated:NO];
+  [session_controller_ commitPendingItem];
 
-  EXPECT_EQ(-1, [session_controller_ pendingEntryIndex]);
-  [session_controller_ setPendingEntryIndex:0];
-  EXPECT_EQ(0, [session_controller_ pendingEntryIndex]);
+  EXPECT_EQ(-1, [session_controller_ pendingItemIndex]);
+  [session_controller_ setPendingItemIndex:0];
+  EXPECT_EQ(0, [session_controller_ pendingItemIndex]);
   EXPECT_EQ([[session_controller_ entries] lastObject],
             [session_controller_ pendingEntry]);
 }
 
-TEST_F(CRWSessionControllerTest, AddPendingEntry) {
-  [session_controller_
-        addPendingEntry:GURL("http://www.url.com")
-               referrer:MakeReferrer("http://www.referer.com")
-             transition:ui::PAGE_TRANSITION_TYPED
-      rendererInitiated:NO];
+TEST_F(CRWSessionControllerTest, addPendingItem) {
+  [session_controller_ addPendingItem:GURL("http://www.url.com")
+                             referrer:MakeReferrer("http://www.referer.com")
+                           transition:ui::PAGE_TRANSITION_TYPED
+                    rendererInitiated:NO];
 
   EXPECT_EQ(0U, [[session_controller_ entries] count]);
   EXPECT_EQ(
       GURL("http://www.url.com/"),
       [session_controller_ currentURL]);
 }
 
-TEST_F(CRWSessionControllerTest, AddPendingEntryWithCommittedEntries) {
-  [session_controller_
-        addPendingEntry:GURL("http://www.committed.url.com")
-               referrer:MakeReferrer("http://www.referer.com")
-             transition:ui::PAGE_TRANSITION_TYPED
-      rendererInitiated:NO];
-  [session_controller_ commitPendingEntry];
+TEST_F(CRWSessionControllerTest, addPendingItemWithCommittedEntries) {
+  [session_controller_ addPendingItem:GURL("http://www.committed.url.com")
+                             referrer:MakeReferrer("http://www.referer.com")
+                           transition:ui::PAGE_TRANSITION_TYPED
+                    rendererInitiated:NO];
+  [session_controller_ commitPendingItem];
 
-  [session_controller_
-        addPendingEntry:GURL("http://www.url.com")
-               referrer:MakeReferrer("http://www.referer.com")
-             transition:ui::PAGE_TRANSITION_TYPED
-      rendererInitiated:NO];
+  [session_controller_ addPendingItem:GURL("http://www.url.com")
+                             referrer:MakeReferrer("http://www.referer.com")
+                           transition:ui::PAGE_TRANSITION_TYPED
+                    rendererInitiated:NO];
 
   EXPECT_EQ(1U, [[session_controller_ entries] count]);
   EXPECT_EQ(
       GURL("http://www.committed.url.com/"),
       [session_controller_ URLForSessionAtIndex:0U]);
   EXPECT_EQ(
       GURL("http://www.url.com/"),
       [session_controller_ currentURL]);
 }
 
 // Tests that adding a pending entry resets pending entry index.
-TEST_F(CRWSessionControllerTest, AddPendingEntryWithExisingPendingEntryIndex) {
-  [session_controller_ addPendingEntry:GURL("http://www.example.com")
-                              referrer:web::Referrer()
-                            transition:ui::PAGE_TRANSITION_TYPED
-                     rendererInitiated:NO];
-  [session_controller_ commitPendingEntry];
-  [session_controller_ addPendingEntry:GURL("http://www.example.com/0")
-                              referrer:web::Referrer()
-                            transition:ui::PAGE_TRANSITION_TYPED
-                     rendererInitiated:NO];
-  [session_controller_ commitPendingEntry];
+TEST_F(CRWSessionControllerTest, addPendingItemWithExisingPendingEntryIndex) {
+  [session_controller_ addPendingItem:GURL("http://www.example.com")
+                             referrer:web::Referrer()
+                           transition:ui::PAGE_TRANSITION_TYPED
+                    rendererInitiated:NO];
+  [session_controller_ commitPendingItem];
+  [session_controller_ addPendingItem:GURL("http://www.example.com/0")
+                             referrer:web::Referrer()
+                           transition:ui::PAGE_TRANSITION_TYPED
+                    rendererInitiated:NO];
+  [session_controller_ commitPendingItem];
 
   // Set 0 as pending entry index.
-  [session_controller_ setPendingEntryIndex:0];
+  [session_controller_ setPendingItemIndex:0];
   EXPECT_EQ(GURL("http://www.example.com/"),
             [[session_controller_ pendingEntry] navigationItem]->GetURL());
-  EXPECT_EQ(0, [session_controller_ pendingEntryIndex]);
+  EXPECT_EQ(0, [session_controller_ pendingItemIndex]);
 
   // Add a pending entry, which should drop pending navigation index.
-  [session_controller_ addPendingEntry:GURL("http://www.example.com/1")
-                              referrer:web::Referrer()
-                            transition:ui::PAGE_TRANSITION_TYPED
-                     rendererInitiated:NO];
+  [session_controller_ addPendingItem:GURL("http://www.example.com/1")
+                             referrer:web::Referrer()
+                           transition:ui::PAGE_TRANSITION_TYPED
+                    rendererInitiated:NO];
   EXPECT_EQ(GURL("http://www.example.com/1"),
             [[session_controller_ pendingEntry] navigationItem]->GetURL());
-  EXPECT_EQ(-1, [session_controller_ pendingEntryIndex]);
+  EXPECT_EQ(-1, [session_controller_ pendingItemIndex]);
 }
 
-TEST_F(CRWSessionControllerTest, AddPendingEntryOverriding) {
+TEST_F(CRWSessionControllerTest, addPendingItemOverriding) {
+  [session_controller_ addPendingItem:GURL("http://www.url.com")
+                             referrer:MakeReferrer("http://www.referer.com")
+                           transition:ui::PAGE_TRANSITION_TYPED
+                    rendererInitiated:NO];
   [session_controller_
-        addPendingEntry:GURL("http://www.url.com")
-               referrer:MakeReferrer("http://www.referer.com")
-             transition:ui::PAGE_TRANSITION_TYPED
-      rendererInitiated:NO];
-  [session_controller_
-        addPendingEntry:GURL("http://www.another.url.com")
+         addPendingItem:GURL("http://www.another.url.com")
                referrer:MakeReferrer("http://www.another.referer.com")
              transition:ui::PAGE_TRANSITION_TYPED
       rendererInitiated:NO];
 
   EXPECT_EQ(0U, [[session_controller_ entries] count]);
   EXPECT_EQ(
       GURL("http://www.another.url.com/"),
       [session_controller_ currentURL]);
 }
 
-TEST_F(CRWSessionControllerTest, AddPendingEntryAndCommit) {
-  [session_controller_
-        addPendingEntry:GURL("http://www.url.com")
-               referrer:MakeReferrer("http://www.referer.com")
-             transition:ui::PAGE_TRANSITION_TYPED
-      rendererInitiated:NO];
-  [session_controller_ commitPendingEntry];
+TEST_F(CRWSessionControllerTest, addPendingItemAndCommit) {
+  [session_controller_ addPendingItem:GURL("http://www.url.com")
+                             referrer:MakeReferrer("http://www.referer.com")
+                           transition:ui::PAGE_TRANSITION_TYPED
+                    rendererInitiated:NO];
+  [session_controller_ commitPendingItem];
 
   EXPECT_EQ(1U, [[session_controller_ entries] count]);
   EXPECT_EQ(
       GURL("http://www.url.com/"),
       [session_controller_ URLForSessionAtIndex:0U]);
   EXPECT_EQ(
       [[session_controller_ entries] objectAtIndex:0U],
       [session_controller_ currentEntry]);
 }
 
-TEST_F(CRWSessionControllerTest, AddPendingEntryOverridingAndCommit) {
+TEST_F(CRWSessionControllerTest, addPendingItemOverridingAndCommit) {
+  [session_controller_ addPendingItem:GURL("http://www.url.com")
+                             referrer:MakeReferrer("http://www.referer.com")
+                           transition:ui::PAGE_TRANSITION_TYPED
+                    rendererInitiated:NO];
   [session_controller_
-        addPendingEntry:GURL("http://www.url.com")
-               referrer:MakeReferrer("http://www.referer.com")
-             transition:ui::PAGE_TRANSITION_TYPED
-      rendererInitiated:NO];
-  [session_controller_
-        addPendingEntry:GURL("http://www.another.url.com")
+         addPendingItem:GURL("http://www.another.url.com")
                referrer:MakeReferrer("http://www.another.referer.com")
              transition:ui::PAGE_TRANSITION_TYPED
       rendererInitiated:NO];
-  [session_controller_ commitPendingEntry];
+  [session_controller_ commitPendingItem];
 
   EXPECT_EQ(1U, [[session_controller_ entries] count]);
   EXPECT_EQ(
       GURL("http://www.another.url.com/"),
       [session_controller_ URLForSessionAtIndex:0U]);
   EXPECT_EQ(
       [[session_controller_ entries] objectAtIndex:0U],
       [session_controller_ currentEntry]);
 }
 
-TEST_F(CRWSessionControllerTest, AddPendingEntryAndCommitMultiple) {
-  [session_controller_
-        addPendingEntry:GURL("http://www.url.com")
-               referrer:MakeReferrer("http://www.referer.com")
-             transition:ui::PAGE_TRANSITION_TYPED
-      rendererInitiated:NO];
-  [session_controller_ commitPendingEntry];
+TEST_F(CRWSessionControllerTest, addPendingItemAndCommitMultiple) {
+  [session_controller_ addPendingItem:GURL("http://www.url.com")
+                             referrer:MakeReferrer("http://www.referer.com")
+                           transition:ui::PAGE_TRANSITION_TYPED
+                    rendererInitiated:NO];
+  [session_controller_ commitPendingItem];
 
   [session_controller_
-        addPendingEntry:GURL("http://www.another.url.com")
+         addPendingItem:GURL("http://www.another.url.com")
                referrer:MakeReferrer("http://www.another.referer.com")
              transition:ui::PAGE_TRANSITION_TYPED
       rendererInitiated:NO];
-  [session_controller_ commitPendingEntry];
+  [session_controller_ commitPendingItem];
 
   EXPECT_EQ(2U, [[session_controller_ entries] count]);
   EXPECT_EQ(
       GURL("http://www.url.com/"),
       [session_controller_ URLForSessionAtIndex:0U]);
   EXPECT_EQ(
       GURL("http://www.another.url.com/"),
       [session_controller_ URLForSessionAtIndex:1U]);
   EXPECT_EQ(
       [[session_controller_ entries] objectAtIndex:1U],
       [session_controller_ currentEntry]);
 }
 
-TEST_F(CRWSessionControllerTest, AddPendingEntryAndDiscard) {
-  [session_controller_
-        addPendingEntry:GURL("http://www.url.com")
-               referrer:MakeReferrer("http://www.referer.com")
-             transition:ui::PAGE_TRANSITION_TYPED
-      rendererInitiated:NO];
-  [session_controller_ discardNonCommittedEntries];
+TEST_F(CRWSessionControllerTest, addPendingItemAndDiscard) {
+  [session_controller_ addPendingItem:GURL("http://www.url.com")
+                             referrer:MakeReferrer("http://www.referer.com")
+                           transition:ui::PAGE_TRANSITION_TYPED
+                    rendererInitiated:NO];
+  [session_controller_ discardNonCommittedItems];
 
   EXPECT_EQ(0U, [[session_controller_ entries] count]);
   EXPECT_EQ(nil, [session_controller_ currentEntry]);
 }
 
-// Tests discarding pending entry added via |setPendingEntryIndex:| call.
-TEST_F(CRWSessionControllerTest, SetPendingEntryIndexAndDiscard) {
-  [session_controller_ addPendingEntry:GURL("http://www.example.com")
-                              referrer:web::Referrer()
-                            transition:ui::PAGE_TRANSITION_TYPED
-                     rendererInitiated:NO];
-  [session_controller_ commitPendingEntry];
+// Tests discarding pending entry added via |setPendingItemIndex:| call.
+TEST_F(CRWSessionControllerTest, setPendingItemIndexAndDiscard) {
+  [session_controller_ addPendingItem:GURL("http://www.example.com")
+                             referrer:web::Referrer()
+                           transition:ui::PAGE_TRANSITION_TYPED
+                    rendererInitiated:NO];
+  [session_controller_ commitPendingItem];
 
-  [session_controller_ setPendingEntryIndex:0];
+  [session_controller_ setPendingItemIndex:0];
   EXPECT_TRUE([session_controller_ pendingEntry]);
-  EXPECT_EQ(0, [session_controller_ pendingEntryIndex]);
+  EXPECT_EQ(0, [session_controller_ pendingItemIndex]);
 
-  [session_controller_ discardNonCommittedEntries];
+  [session_controller_ discardNonCommittedItems];
   EXPECT_FALSE([session_controller_ pendingEntry]);
-  EXPECT_EQ(-1, [session_controller_ pendingEntryIndex]);
+  EXPECT_EQ(-1, [session_controller_ pendingItemIndex]);
 }
 
-TEST_F(CRWSessionControllerTest, AddPendingEntryAndDiscardAndAddAndCommit) {
-  [session_controller_
-        addPendingEntry:GURL("http://www.url.com")
-               referrer:MakeReferrer("http://www.referer.com")
-             transition:ui::PAGE_TRANSITION_TYPED
-      rendererInitiated:NO];
-  [session_controller_ discardNonCommittedEntries];
+TEST_F(CRWSessionControllerTest, addPendingItemAndDiscardAndAddAndCommit) {
+  [session_controller_ addPendingItem:GURL("http://www.url.com")
+                             referrer:MakeReferrer("http://www.referer.com")
+                           transition:ui::PAGE_TRANSITION_TYPED
+                    rendererInitiated:NO];
+  [session_controller_ discardNonCommittedItems];
 
-  [session_controller_
-        addPendingEntry:GURL("http://www.another.url.com")
-               referrer:MakeReferrer("http://www.referer.com")
-             transition:ui::PAGE_TRANSITION_TYPED
-      rendererInitiated:NO];
-  [session_controller_ commitPendingEntry];
+  [session_controller_ addPendingItem:GURL("http://www.another.url.com")
+                             referrer:MakeReferrer("http://www.referer.com")
+                           transition:ui::PAGE_TRANSITION_TYPED
+                    rendererInitiated:NO];
+  [session_controller_ commitPendingItem];
 
   EXPECT_EQ(1U, [[session_controller_ entries] count]);
   EXPECT_EQ(
       GURL("http://www.another.url.com/"),
       [session_controller_ URLForSessionAtIndex:0U]);
   EXPECT_EQ(
       [[session_controller_ entries] objectAtIndex:0U],
       [session_controller_ currentEntry]);
 }
 
-TEST_F(CRWSessionControllerTest, AddPendingEntryAndCommitAndAddAndDiscard) {
-  [session_controller_
-        addPendingEntry:GURL("http://www.url.com")
-               referrer:MakeReferrer("http://www.referer.com")
-             transition:ui::PAGE_TRANSITION_TYPED
-      rendererInitiated:NO];
-  [session_controller_ commitPendingEntry];
+TEST_F(CRWSessionControllerTest, addPendingItemAndCommitAndAddAndDiscard) {
+  [session_controller_ addPendingItem:GURL("http://www.url.com")
+                             referrer:MakeReferrer("http://www.referer.com")
+                           transition:ui::PAGE_TRANSITION_TYPED
+                    rendererInitiated:NO];
+  [session_controller_ commitPendingItem];
 
-  [session_controller_
-        addPendingEntry:GURL("http://www.another.url.com")
-               referrer:MakeReferrer("http://www.referer.com")
-             transition:ui::PAGE_TRANSITION_TYPED
-      rendererInitiated:NO];
-  [session_controller_ discardNonCommittedEntries];
+  [session_controller_ addPendingItem:GURL("http://www.another.url.com")
+                             referrer:MakeReferrer("http://www.referer.com")
+                           transition:ui::PAGE_TRANSITION_TYPED
+                    rendererInitiated:NO];
+  [session_controller_ discardNonCommittedItems];
 
   EXPECT_EQ(1U, [[session_controller_ entries] count]);
   EXPECT_EQ(
       GURL("http://www.url.com/"),
       [session_controller_ URLForSessionAtIndex:0U]);
   EXPECT_EQ(
       [[session_controller_ entries] objectAtIndex:0U],
       [session_controller_ currentEntry]);
 }
 
 TEST_F(CRWSessionControllerTest,
-       CommitPendingEntryWithoutPendingOrCommittedEntry) {
-  [session_controller_ commitPendingEntry];
+       commitPendingItemWithoutPendingOrCommittedEntry) {
+  [session_controller_ commitPendingItem];
 
   EXPECT_EQ(0U, [[session_controller_ entries] count]);
   EXPECT_EQ(nil, [session_controller_ currentEntry]);
 }
 
 TEST_F(CRWSessionControllerTest,
-       CommitPendingEntryWithoutPendingEntryWithCommittedEntry) {
+       commitPendingItemWithoutPendingEntryWithCommittedEntry) {
   // Setup committed entry
-  [session_controller_
-        addPendingEntry:GURL("http://www.url.com")
-               referrer:MakeReferrer("http://www.referer.com")
-             transition:ui::PAGE_TRANSITION_TYPED
-      rendererInitiated:NO];
-  [session_controller_ commitPendingEntry];
+  [session_controller_ addPendingItem:GURL("http://www.url.com")
+                             referrer:MakeReferrer("http://www.referer.com")
+                           transition:ui::PAGE_TRANSITION_TYPED
+                    rendererInitiated:NO];
+  [session_controller_ commitPendingItem];
 
   // Commit pending entry when there is no such one
-  [session_controller_ commitPendingEntry];
+  [session_controller_ commitPendingItem];
 
   EXPECT_EQ(1U, [[session_controller_ entries] count]);
   EXPECT_EQ(
       [[session_controller_ entries] objectAtIndex:0U],
       [session_controller_ currentEntry]);
 }
 
 // Tests that forward entries are discarded after navigation entry is committed.
-TEST_F(CRWSessionControllerTest, CommitPendingEntryWithExistingForwardEntries) {
+TEST_F(CRWSessionControllerTest, commitPendingItemWithExistingForwardEntries) {
   // Make 3 entries.
-  [session_controller_ addPendingEntry:GURL("http://www.example.com/0")
-                              referrer:MakeReferrer("http://www.example.com/a")
-                            transition:ui::PAGE_TRANSITION_LINK
-                     rendererInitiated:YES];
-  [session_controller_ commitPendingEntry];
-  [session_controller_ addPendingEntry:GURL("http://www.example.com/1")
-                              referrer:MakeReferrer("http://www.example.com/b")
-                            transition:ui::PAGE_TRANSITION_LINK
-                     rendererInitiated:YES];
-  [session_controller_ commitPendingEntry];
-  [session_controller_ addPendingEntry:GURL("http://www.example.com/2")
-                              referrer:MakeReferrer("http://www.example.com/c")
-                            transition:ui::PAGE_TRANSITION_LINK
-                     rendererInitiated:YES];
-  [session_controller_ commitPendingEntry];
+  [session_controller_ addPendingItem:GURL("http://www.example.com/0")
+                             referrer:MakeReferrer("http://www.example.com/a")
+                           transition:ui::PAGE_TRANSITION_LINK
+                    rendererInitiated:YES];
+  [session_controller_ commitPendingItem];
+  [session_controller_ addPendingItem:GURL("http://www.example.com/1")
+                             referrer:MakeReferrer("http://www.example.com/b")
+                           transition:ui::PAGE_TRANSITION_LINK
+                    rendererInitiated:YES];
+  [session_controller_ commitPendingItem];
+  [session_controller_ addPendingItem:GURL("http://www.example.com/2")
+                             referrer:MakeReferrer("http://www.example.com/c")
+                           transition:ui::PAGE_TRANSITION_LINK
+                    rendererInitiated:YES];
+  [session_controller_ commitPendingItem];
 
   // Go back to the first entry.
-  [session_controller_ goToEntryAtIndex:0];
+  [session_controller_ goToItemAtIndex:0];
 
   // Create and commit a new pending entry.
-  [session_controller_ addPendingEntry:GURL("http://www.example.com/2")
-                              referrer:MakeReferrer("http://www.example.com/c")
-                            transition:ui::PAGE_TRANSITION_LINK
-                     rendererInitiated:YES];
-  [session_controller_ commitPendingEntry];
+  [session_controller_ addPendingItem:GURL("http://www.example.com/2")
+                             referrer:MakeReferrer("http://www.example.com/c")
+                           transition:ui::PAGE_TRANSITION_LINK
+                    rendererInitiated:YES];
+  [session_controller_ commitPendingItem];
 
   // All forward entries should go away.
   EXPECT_EQ(2U, [[session_controller_ entries] count]);
   EXPECT_EQ(0U, [[session_controller_ forwardEntries] count]);
   ASSERT_EQ(1, [session_controller_ currentNavigationIndex]);
   ASSERT_EQ(0, [session_controller_ previousNavigationIndex]);
 }
 
 // Tests committing pending entry index from the middle.
-TEST_F(CRWSessionControllerTest, CommitPendingEntryIndex) {
-  [session_controller_ addPendingEntry:GURL("http://www.example.com/0")
-                              referrer:web::Referrer()
-                            transition:ui::PAGE_TRANSITION_TYPED
-                     rendererInitiated:NO];
-  [session_controller_ commitPendingEntry];
-  [session_controller_ addPendingEntry:GURL("http://www.example.com/1")
-                              referrer:web::Referrer()
-                            transition:ui::PAGE_TRANSITION_TYPED
-                     rendererInitiated:NO];
-  [session_controller_ commitPendingEntry];
-  [session_controller_ addPendingEntry:GURL("http://www.example.com/2")
-                              referrer:web::Referrer()
-                            transition:ui::PAGE_TRANSITION_TYPED
-                     rendererInitiated:NO];
-  [session_controller_ commitPendingEntry];
+TEST_F(CRWSessionControllerTest, commitPendingItemIndex) {
+  [session_controller_ addPendingItem:GURL("http://www.example.com/0")
+                             referrer:web::Referrer()
+                           transition:ui::PAGE_TRANSITION_TYPED
+                    rendererInitiated:NO];
+  [session_controller_ commitPendingItem];
+  [session_controller_ addPendingItem:GURL("http://www.example.com/1")
+                             referrer:web::Referrer()
+                           transition:ui::PAGE_TRANSITION_TYPED
+                    rendererInitiated:NO];
+  [session_controller_ commitPendingItem];
+  [session_controller_ addPendingItem:GURL("http://www.example.com/2")
+                             referrer:web::Referrer()
+                           transition:ui::PAGE_TRANSITION_TYPED
+                    rendererInitiated:NO];
+  [session_controller_ commitPendingItem];
   ASSERT_EQ(3U, [[session_controller_ entries] count]);
 
   // Go to the middle, and commit first pending entry index.
-  [session_controller_ goToEntryAtIndex:1];
-  [session_controller_ setPendingEntryIndex:0];
-  ASSERT_EQ(0, [session_controller_ pendingEntryIndex]);
+  [session_controller_ goToItemAtIndex:1];
+  [session_controller_ setPendingItemIndex:0];
+  ASSERT_EQ(0, [session_controller_ pendingItemIndex]);
   base::scoped_nsobject<CRWSessionEntry> pendingEntry(
       [[session_controller_ pendingEntry] retain]);
   ASSERT_TRUE(pendingEntry);
   ASSERT_EQ(1, [session_controller_ currentNavigationIndex]);
   EXPECT_EQ(2, [session_controller_ previousNavigationIndex]);
-  [session_controller_ commitPendingEntry];
+  [session_controller_ commitPendingItem];
 
   // Verify that pending entry has been committed and current and previous entry
   // indices updated.
   EXPECT_EQ(pendingEntry, [session_controller_ lastCommittedEntry]);
-  EXPECT_EQ(-1, [session_controller_ pendingEntryIndex]);
+  EXPECT_EQ(-1, [session_controller_ pendingItemIndex]);
   EXPECT_FALSE([session_controller_ pendingEntry]);
   EXPECT_EQ(0, [session_controller_ currentNavigationIndex]);
   EXPECT_EQ(1, [session_controller_ previousNavigationIndex]);
   EXPECT_EQ(3U, [[session_controller_ entries] count]);
 }
 
 TEST_F(CRWSessionControllerTest,
        DiscardPendingEntryWithoutPendingOrCommittedEntry) {
-  [session_controller_ discardNonCommittedEntries];
+  [session_controller_ discardNonCommittedItems];
 
   EXPECT_EQ(0U, [[session_controller_ entries] count]);
   EXPECT_EQ(nil, [session_controller_ currentEntry]);
 }
 
 TEST_F(CRWSessionControllerTest,
        DiscardPendingEntryWithoutPendingEntryWithCommittedEntry) {
   // Setup committed entry
-  [session_controller_
-        addPendingEntry:GURL("http://www.url.com")
-               referrer:MakeReferrer("http://www.referer.com")
-             transition:ui::PAGE_TRANSITION_TYPED
-      rendererInitiated:NO];
-  [session_controller_ commitPendingEntry];
+  [session_controller_ addPendingItem:GURL("http://www.url.com")
+                             referrer:MakeReferrer("http://www.referer.com")
+                           transition:ui::PAGE_TRANSITION_TYPED
+                    rendererInitiated:NO];
+  [session_controller_ commitPendingItem];
 
   // Discard noncommitted entries when there is no such one
-  [session_controller_ discardNonCommittedEntries];
+  [session_controller_ discardNonCommittedItems];
 
   EXPECT_EQ(1U, [[session_controller_ entries] count]);
   EXPECT_EQ(
       [[session_controller_ entries] objectAtIndex:0U],
       [session_controller_ currentEntry]);
 }
 
-TEST_F(CRWSessionControllerTest, UpdatePendingEntryWithoutPendingEntry) {
-  [session_controller_
-       updatePendingEntry:GURL("http://www.another.url.com")];
-  [session_controller_ commitPendingEntry];
+TEST_F(CRWSessionControllerTest, updatePendingItemWithoutPendingEntry) {
+  [session_controller_ updatePendingItem:GURL("http://www.another.url.com")];
+  [session_controller_ commitPendingItem];
 
   EXPECT_EQ(0U, [[session_controller_ entries] count]);
   EXPECT_EQ(nil, [session_controller_ currentEntry]);
 }
 
-TEST_F(CRWSessionControllerTest, UpdatePendingEntryWithPendingEntry) {
-  [session_controller_
-        addPendingEntry:GURL("http://www.url.com")
-               referrer:MakeReferrer("http://www.referer.com")
-             transition:ui::PAGE_TRANSITION_TYPED
-      rendererInitiated:NO];
-  [session_controller_
-       updatePendingEntry:GURL("http://www.another.url.com")];
+TEST_F(CRWSessionControllerTest, updatePendingItemWithPendingEntry) {
+  [session_controller_ addPendingItem:GURL("http://www.url.com")
+                             referrer:MakeReferrer("http://www.referer.com")
+                           transition:ui::PAGE_TRANSITION_TYPED
+                    rendererInitiated:NO];
+  [session_controller_ updatePendingItem:GURL("http://www.another.url.com")];
 
   EXPECT_EQ(
       GURL("http://www.another.url.com/"),
       [session_controller_ currentURL]);
 }
 
 TEST_F(CRWSessionControllerTest,
-       UpdatePendingEntryWithPendingEntryAlreadyCommited) {
-  [session_controller_
-        addPendingEntry:GURL("http://www.url.com")
-               referrer:MakeReferrer("http://www.referer.com")
-             transition:ui::PAGE_TRANSITION_TYPED
-      rendererInitiated:NO];
-  [session_controller_ commitPendingEntry];
-  [session_controller_
-       updatePendingEntry:GURL("http://www.another.url.com")];
-  [session_controller_ commitPendingEntry];
+       updatePendingItemWithPendingEntryAlreadyCommited) {
+  [session_controller_ addPendingItem:GURL("http://www.url.com")
+                             referrer:MakeReferrer("http://www.referer.com")
+                           transition:ui::PAGE_TRANSITION_TYPED
+                    rendererInitiated:NO];
+  [session_controller_ commitPendingItem];
+  [session_controller_ updatePendingItem:GURL("http://www.another.url.com")];
+  [session_controller_ commitPendingItem];
 
   EXPECT_EQ(1U, [[session_controller_ entries] count]);
   EXPECT_EQ(
       GURL("http://www.url.com/"),
       [session_controller_ URLForSessionAtIndex:0U]);
   EXPECT_EQ(
       [[session_controller_ entries] objectAtIndex:0U],
       [session_controller_ currentEntry]);
 }
 
 // Tests inserting session controller state.
 TEST_F(CRWSessionControllerTest, InsertState) {
   // Add 1 committed and 1 pending entry to target controller.
-  [session_controller_ addPendingEntry:GURL("http://www.url.com/2")
-                              referrer:web::Referrer()
-                            transition:ui::PAGE_TRANSITION_TYPED
-                     rendererInitiated:NO];
-  [session_controller_ commitPendingEntry];
-  [session_controller_ addPendingEntry:GURL("http://www.url.com/3")
-                              referrer:web::Referrer()
-                            transition:ui::PAGE_TRANSITION_TYPED
-                     rendererInitiated:NO];
+  [session_controller_ addPendingItem:GURL("http://www.url.com/2")
+                             referrer:web::Referrer()
+                           transition:ui::PAGE_TRANSITION_TYPED
+                    rendererInitiated:NO];
+  [session_controller_ commitPendingItem];
+  [session_controller_ addPendingItem:GURL("http://www.url.com/3")
+                             referrer:web::Referrer()
+                           transition:ui::PAGE_TRANSITION_TYPED
+                    rendererInitiated:NO];
 
   // Create source session controller with 1 committed entry.
   base::scoped_nsobject<CRWSessionController> other_session_controller(
       [[CRWSessionController alloc] initWithWindowName:nil
                                               openerId:nil
                                            openedByDOM:NO
                                  openerNavigationIndex:0
                                           browserState:&browser_state_]);
   [other_session_controller setWindowName:@"test-window"];
-  [other_session_controller addPendingEntry:GURL("http://www.url.com/0")
-                                   referrer:web::Referrer()
-                                 transition:ui::PAGE_TRANSITION_TYPED
-                          rendererInitiated:NO];
-  [other_session_controller commitPendingEntry];
-  [other_session_controller addPendingEntry:GURL("http://www.url.com/1")
-                                   referrer:web::Referrer()
-                                 transition:ui::PAGE_TRANSITION_TYPED
-                          rendererInitiated:NO];
+  [other_session_controller addPendingItem:GURL("http://www.url.com/0")
+                                  referrer:web::Referrer()
+                                transition:ui::PAGE_TRANSITION_TYPED
+                         rendererInitiated:NO];
+  [other_session_controller commitPendingItem];
+  [other_session_controller addPendingItem:GURL("http://www.url.com/1")
+                                  referrer:web::Referrer()
+                                transition:ui::PAGE_TRANSITION_TYPED
+                         rendererInitiated:NO];
 
   // Insert and verify the state of target session controller.
   [session_controller_
       insertStateFromSessionController:other_session_controller.get()];
 
   EXPECT_NSEQ(@"test-window", [session_controller_ windowName]);
   EXPECT_EQ(2U, [[session_controller_ entries] count]);
   EXPECT_EQ(1, [session_controller_ currentNavigationIndex]);
   EXPECT_EQ(-1, [session_controller_ previousNavigationIndex]);
-  EXPECT_EQ(-1, [session_controller_ pendingEntryIndex]);
+  EXPECT_EQ(-1, [session_controller_ pendingItemIndex]);
 
   EXPECT_EQ(GURL("http://www.url.com/0"),
             [session_controller_ URLForSessionAtIndex:0]);
   EXPECT_EQ(GURL("http://www.url.com/2"),
             [session_controller_ URLForSessionAtIndex:1]);
   EXPECT_EQ(GURL("http://www.url.com/3"),
             [[session_controller_ pendingEntry] navigationItem]->GetURL());
 }
 
 // Tests inserting session controller state from empty session controller.
 TEST_F(CRWSessionControllerTest, InsertStateFromEmptySessionController) {
   // Add 2 committed entries to target controller.
-  [session_controller_ addPendingEntry:GURL("http://www.url.com/0")
-                              referrer:web::Referrer()
-                            transition:ui::PAGE_TRANSITION_TYPED
-                     rendererInitiated:NO];
-  [session_controller_ commitPendingEntry];
-  [session_controller_ addPendingEntry:GURL("http://www.url.com/1")
-                              referrer:web::Referrer()
-                            transition:ui::PAGE_TRANSITION_TYPED
-                     rendererInitiated:NO];
-  [session_controller_ commitPendingEntry];
+  [session_controller_ addPendingItem:GURL("http://www.url.com/0")
+                             referrer:web::Referrer()
+                           transition:ui::PAGE_TRANSITION_TYPED
+                    rendererInitiated:NO];
+  [session_controller_ commitPendingItem];
+  [session_controller_ addPendingItem:GURL("http://www.url.com/1")
+                             referrer:web::Referrer()
+                           transition:ui::PAGE_TRANSITION_TYPED
+                    rendererInitiated:NO];
+  [session_controller_ commitPendingItem];
 
   // Create empty source session controller.
   base::scoped_nsobject<CRWSessionController> other_session_controller(
       [[CRWSessionController alloc] initWithWindowName:nil
                                               openerId:nil
                                            openedByDOM:NO
                                  openerNavigationIndex:0
                                           browserState:&browser_state_]);
   [other_session_controller setWindowName:@"test-window"];
 
   // Insert and verify the state of target session controller.
   [session_controller_
       insertStateFromSessionController:other_session_controller.get()];
 
   EXPECT_NSEQ(@"test-window", [session_controller_ windowName]);
   EXPECT_EQ(2U, [[session_controller_ entries] count]);
   EXPECT_EQ(1, [session_controller_ currentNavigationIndex]);
   EXPECT_EQ(0, [session_controller_ previousNavigationIndex]);
-  EXPECT_EQ(-1, [session_controller_ pendingEntryIndex]);
+  EXPECT_EQ(-1, [session_controller_ pendingItemIndex]);
   EXPECT_FALSE([session_controller_ pendingEntry]);
   EXPECT_EQ(GURL("http://www.url.com/0"),
             [session_controller_ URLForSessionAtIndex:0]);
   EXPECT_EQ(GURL("http://www.url.com/1"),
             [session_controller_ URLForSessionAtIndex:1]);
 }
 
 // Tests inserting session controller state to empty session controller.
 TEST_F(CRWSessionControllerTest, InsertStateToEmptySessionController) {
   // Create source session controller with 2 committed entries and one
   // pending entry.
   base::scoped_nsobject<CRWSessionController> other_session_controller(
       [[CRWSessionController alloc] initWithWindowName:nil
                                               openerId:nil
                                            openedByDOM:NO
                                  openerNavigationIndex:0
                                           browserState:&browser_state_]);
   [other_session_controller setWindowName:@"test-window"];
-  [other_session_controller addPendingEntry:GURL("http://www.url.com/0")
-                                   referrer:web::Referrer()
-                                 transition:ui::PAGE_TRANSITION_TYPED
-                          rendererInitiated:NO];
-  [other_session_controller commitPendingEntry];
-  [other_session_controller addPendingEntry:GURL("http://www.url.com/1")
-                                   referrer:web::Referrer()
-                                 transition:ui::PAGE_TRANSITION_TYPED
-                          rendererInitiated:NO];
-  [other_session_controller commitPendingEntry];
-  [other_session_controller addPendingEntry:GURL("http://www.url.com/2")
-                                   referrer:web::Referrer()
-                                 transition:ui::PAGE_TRANSITION_TYPED
-                          rendererInitiated:NO];
+  [other_session_controller addPendingItem:GURL("http://www.url.com/0")
+                                  referrer:web::Referrer()
+                                transition:ui::PAGE_TRANSITION_TYPED
+                         rendererInitiated:NO];
+  [other_session_controller commitPendingItem];
+  [other_session_controller addPendingItem:GURL("http://www.url.com/1")
+                                  referrer:web::Referrer()
+                                transition:ui::PAGE_TRANSITION_TYPED
+                         rendererInitiated:NO];
+  [other_session_controller commitPendingItem];
+  [other_session_controller addPendingItem:GURL("http://www.url.com/2")
+                                  referrer:web::Referrer()
+                                transition:ui::PAGE_TRANSITION_TYPED
+                         rendererInitiated:NO];
 
   // Insert and verify the state of target session controller.
   [session_controller_
       insertStateFromSessionController:other_session_controller.get()];
 
   EXPECT_NSEQ(@"test-window", [session_controller_ windowName]);
   EXPECT_EQ(2U, [[session_controller_ entries] count]);
   EXPECT_EQ(1, [session_controller_ currentNavigationIndex]);
   EXPECT_EQ(-1, [session_controller_ previousNavigationIndex]);
-  EXPECT_EQ(-1, [session_controller_ pendingEntryIndex]);
+  EXPECT_EQ(-1, [session_controller_ pendingItemIndex]);
   EXPECT_FALSE([session_controller_ pendingEntry]);
   EXPECT_EQ(GURL("http://www.url.com/0"),
             [session_controller_ URLForSessionAtIndex:0]);
   EXPECT_EQ(GURL("http://www.url.com/1"),
             [session_controller_ URLForSessionAtIndex:1]);
 }
 
 // Tests inserting session controller state. Verifies that pending entry index
 // remains valid.
 TEST_F(CRWSessionControllerTest,
        InsertStateWithPendingEntryIndexInTargetController) {
   // Add 2 committed entries and make the first entry pending.
-  [session_controller_ addPendingEntry:GURL("http://www.url.com/2")
-                              referrer:web::Referrer()
-                            transition:ui::PAGE_TRANSITION_TYPED
-                     rendererInitiated:NO];
-  [session_controller_ commitPendingEntry];
-  [session_controller_ addPendingEntry:GURL("http://www.url.com/3")
-                              referrer:web::Referrer()
-                            transition:ui::PAGE_TRANSITION_TYPED
-                     rendererInitiated:NO];
-  [session_controller_ commitPendingEntry];
-  [session_controller_ setPendingEntryIndex:0];
+  [session_controller_ addPendingItem:GURL("http://www.url.com/2")
+                             referrer:web::Referrer()
+                           transition:ui::PAGE_TRANSITION_TYPED
+                    rendererInitiated:NO];
+  [session_controller_ commitPendingItem];
+  [session_controller_ addPendingItem:GURL("http://www.url.com/3")
+                             referrer:web::Referrer()
+                           transition:ui::PAGE_TRANSITION_TYPED
+                    rendererInitiated:NO];
+  [session_controller_ commitPendingItem];
+  [session_controller_ setPendingItemIndex:0];
 
   // Create source session controller with 1 committed entry.
   base::scoped_nsobject<CRWSessionController> other_session_controller(
       [[CRWSessionController alloc] initWithWindowName:nil
                                               openerId:nil
                                            openedByDOM:NO
                                  openerNavigationIndex:0
                                           browserState:&browser_state_]);
   [other_session_controller setWindowName:@"test-window"];
-  [other_session_controller addPendingEntry:GURL("http://www.url.com/0")
-                                   referrer:web::Referrer()
-                                 transition:ui::PAGE_TRANSITION_TYPED
-                          rendererInitiated:NO];
-  [other_session_controller commitPendingEntry];
+  [other_session_controller addPendingItem:GURL("http://www.url.com/0")
+                                  referrer:web::Referrer()
+                                transition:ui::PAGE_TRANSITION_TYPED
+                         rendererInitiated:NO];
+  [other_session_controller commitPendingItem];
 
   // Insert and verify the state of target session controller.
   [session_controller_
       insertStateFromSessionController:other_session_controller.get()];
 
   EXPECT_NSEQ(@"test-window", [session_controller_ windowName]);
   EXPECT_EQ(3U, [[session_controller_ entries] count]);
   EXPECT_EQ(2, [session_controller_ currentNavigationIndex]);
   EXPECT_EQ(-1, [session_controller_ previousNavigationIndex]);
-  EXPECT_EQ(1, [session_controller_ pendingEntryIndex]);
+  EXPECT_EQ(1, [session_controller_ pendingItemIndex]);
   EXPECT_EQ(GURL("http://www.url.com/0"),
             [session_controller_ URLForSessionAtIndex:0]);
   EXPECT_EQ(GURL("http://www.url.com/2"),
             [session_controller_ URLForSessionAtIndex:1]);
   EXPECT_EQ(GURL("http://www.url.com/2"),
             [[session_controller_ pendingEntry] navigationItem]->GetURL());
 }
 
 // Tests state of an empty session controller.
 TEST_F(CRWSessionControllerTest, EmptyController) {
   EXPECT_EQ(0U, [[session_controller_ entries] count]);
   EXPECT_EQ(-1, [session_controller_ currentNavigationIndex]);
   EXPECT_EQ(-1, [session_controller_ previousNavigationIndex]);
   EXPECT_FALSE([session_controller_ currentEntry]);
   EXPECT_FALSE([session_controller_ pendingEntry]);
-  EXPECT_EQ(-1, [session_controller_ pendingEntryIndex]);
+  EXPECT_EQ(-1, [session_controller_ pendingItemIndex]);
 }
 
 // Helper to create a NavigationItem.
 std::unique_ptr<web::NavigationItemImpl> CreateNavigationItem(
     const std::string& url,
     const std::string& referrer,
     NSString* title) {
   web::Referrer referrer_object(GURL(referrer),
                                 web::ReferrerPolicyDefault);
   std::unique_ptr<web::NavigationItemImpl> navigation_item =
@@ skipping 38 matching lines @@
   // the entire object is created properly.
   CRWSessionEntry* current_entry = controller.get().currentEntry;
   EXPECT_EQ(current_entry.navigationItem->GetURL(),
             GURL("http://www.yahoo.com"));
   EXPECT_EQ([[controller openerId] length], 0UL);
 }
 
 // Tests index of previous navigation entry.
 TEST_F(CRWSessionControllerTest, PreviousNavigationEntry) {
   EXPECT_EQ(session_controller_.get().previousNavigationIndex, -1);
-  [session_controller_
-        addPendingEntry:GURL("http://www.url.com")
-               referrer:MakeReferrer("http://www.referer.com")
-             transition:ui::PAGE_TRANSITION_TYPED
-      rendererInitiated:NO];
-  [session_controller_ commitPendingEntry];
+  [session_controller_ addPendingItem:GURL("http://www.url.com")
+                             referrer:MakeReferrer("http://www.referer.com")
+                           transition:ui::PAGE_TRANSITION_TYPED
+                    rendererInitiated:NO];
+  [session_controller_ commitPendingItem];
   EXPECT_EQ(session_controller_.get().previousNavigationIndex, -1);
-  [session_controller_
-        addPendingEntry:GURL("http://www.url1.com")
-               referrer:MakeReferrer("http://www.referer.com")
-             transition:ui::PAGE_TRANSITION_TYPED
-      rendererInitiated:NO];
-  [session_controller_ commitPendingEntry];
+  [session_controller_ addPendingItem:GURL("http://www.url1.com")
+                             referrer:MakeReferrer("http://www.referer.com")
+                           transition:ui::PAGE_TRANSITION_TYPED
+                    rendererInitiated:NO];
+  [session_controller_ commitPendingItem];
   EXPECT_EQ(session_controller_.get().previousNavigationIndex, 0);
-  [session_controller_
-        addPendingEntry:GURL("http://www.url2.com")
-               referrer:MakeReferrer("http://www.referer.com")
-             transition:ui::PAGE_TRANSITION_TYPED
-      rendererInitiated:NO];
-  [session_controller_ commitPendingEntry];
+  [session_controller_ addPendingItem:GURL("http://www.url2.com")
+                             referrer:MakeReferrer("http://www.referer.com")
+                           transition:ui::PAGE_TRANSITION_TYPED
+                    rendererInitiated:NO];
+  [session_controller_ commitPendingItem];
 
   EXPECT_EQ(session_controller_.get().previousNavigationIndex, 1);
 
-  [session_controller_ goToEntryAtIndex:1];
+  [session_controller_ goToItemAtIndex:1];
   EXPECT_EQ(session_controller_.get().previousNavigationIndex, 2);
 
-  [session_controller_ goToEntryAtIndex:0];
+  [session_controller_ goToItemAtIndex:0];
   EXPECT_EQ(session_controller_.get().previousNavigationIndex, 1);
 
-  [session_controller_ goToEntryAtIndex:1];
+  [session_controller_ goToItemAtIndex:1];
   EXPECT_EQ(session_controller_.get().previousNavigationIndex, 0);
 
-  [session_controller_ goToEntryAtIndex:2];
+  [session_controller_ goToItemAtIndex:2];
   EXPECT_EQ(session_controller_.get().previousNavigationIndex, 1);
 }
 
 TEST_F(CRWSessionControllerTest, PushNewEntry) {
   std::vector<std::unique_ptr<web::NavigationItem>> items;
   items.push_back(CreateNavigationItem("http://www.firstpage.com",
                                        "http://www.starturl.com", @"First"));
   items.push_back(CreateNavigationItem("http://www.secondpage.com",
                                        "http://www.firstpage.com", @"Second"));
   items.push_back(CreateNavigationItem("http://www.thirdpage.com",
                                        "http://www.secondpage.com", @"Third"));
   base::scoped_nsobject<CRWSessionController> controller(
       [[CRWSessionController alloc] initWithNavigationItems:std::move(items)
                                                currentIndex:0
                                                browserState:&browser_state_]);
 
   GURL pushPageGurl1("http://www.firstpage.com/#push1");
   NSString* stateObject1 = @"{'foo': 1}";
-  [controller pushNewEntryWithURL:pushPageGurl1
-                      stateObject:stateObject1
-                       transition:ui::PAGE_TRANSITION_LINK];
+  [controller pushNewItemWithURL:pushPageGurl1
+                     stateObject:stateObject1
+                      transition:ui::PAGE_TRANSITION_LINK];
   CRWSessionEntry* pushedEntry = [controller currentEntry];
   web::NavigationItemImpl* pushedItem = pushedEntry.navigationItemImpl;
   NSUInteger expectedCount = 2;
   EXPECT_EQ(expectedCount, controller.get().entries.count);
   EXPECT_EQ(pushPageGurl1, pushedEntry.navigationItem->GetURL());
   EXPECT_TRUE(pushedItem->IsCreatedFromPushState());
   EXPECT_NSEQ(stateObject1, pushedItem->GetSerializedStateObject());
   EXPECT_EQ(GURL("http://www.firstpage.com/"),
             pushedEntry.navigationItem->GetReferrer().url);
 
   // Add another new entry and check size and fields again.
   GURL pushPageGurl2("http://www.firstpage.com/push2");
-  [controller pushNewEntryWithURL:pushPageGurl2
-                      stateObject:nil
-                       transition:ui::PAGE_TRANSITION_LINK];
+  [controller pushNewItemWithURL:pushPageGurl2
+                     stateObject:nil
+                      transition:ui::PAGE_TRANSITION_LINK];
   pushedEntry = [controller currentEntry];
   pushedItem = pushedEntry.navigationItemImpl;
   expectedCount = 3;
   EXPECT_EQ(expectedCount, controller.get().entries.count);
   EXPECT_EQ(pushPageGurl2, pushedEntry.navigationItem->GetURL());
   EXPECT_TRUE(pushedItem->IsCreatedFromPushState());
   EXPECT_EQ(nil, pushedItem->GetSerializedStateObject());
   EXPECT_EQ(pushPageGurl1, pushedEntry.navigationItem->GetReferrer().url);
 }
 
@@ skipping 11 matching lines @@
   // Push state navigation.
   items.push_back(
       CreateNavigationItem("http://foo.com/bar", "http://foo.com", @"Fifth"));
   // Push state navigation.
   items.push_back(CreateNavigationItem("http://foo.com/bar#bar",
                                        "http://foo.com/bar", @"Sixth"));
   base::scoped_nsobject<CRWSessionController> controller(
       [[CRWSessionController alloc] initWithNavigationItems:std::move(items)
                                                currentIndex:0
                                                browserState:&browser_state_]);
-  CRWSessionEntry* entry0 = [controller.get().entries objectAtIndex:0];
-  CRWSessionEntry* entry1 = [controller.get().entries objectAtIndex:1];
-  CRWSessionEntry* entry2 = [controller.get().entries objectAtIndex:2];
-  CRWSessionEntry* entry3 = [controller.get().entries objectAtIndex:3];
-  CRWSessionEntry* entry4 = [controller.get().entries objectAtIndex:4];
-  CRWSessionEntry* entry5 = [controller.get().entries objectAtIndex:5];
-  entry1.navigationItemImpl->SetIsCreatedFromPushState(true);
-  entry4.navigationItemImpl->SetIsCreatedFromHashChange(true);
-  entry5.navigationItemImpl->SetIsCreatedFromPushState(true);
+  web::NavigationItemImpl* item0 =
+      static_cast<web::NavigationItemImpl*>([controller items][0]);
+  web::NavigationItemImpl* item1 =
+      static_cast<web::NavigationItemImpl*>([controller items][1]);
+  web::NavigationItemImpl* item2 =
+      static_cast<web::NavigationItemImpl*>([controller items][2]);
+  web::NavigationItemImpl* item3 =
+      static_cast<web::NavigationItemImpl*>([controller items][3]);
+  web::NavigationItemImpl* item4 =
+      static_cast<web::NavigationItemImpl*>([controller items][4]);
+  web::NavigationItemImpl* item5 =
+      static_cast<web::NavigationItemImpl*>([controller items][5]);
+  item1->SetIsCreatedFromPushState(true);
+  item4->SetIsCreatedFromHashChange(true);
+  item5->SetIsCreatedFromPushState(true);
 
   EXPECT_FALSE(
-      [controller isSameDocumentNavigationBetweenEntry:entry0 andEntry:entry0]);
+      [controller isSameDocumentNavigationBetweenItem:item0 andItem:item0]);
   EXPECT_TRUE(
-      [controller isSameDocumentNavigationBetweenEntry:entry0 andEntry:entry1]);
+      [controller isSameDocumentNavigationBetweenItem:item0 andItem:item1]);
   EXPECT_TRUE(
-      [controller isSameDocumentNavigationBetweenEntry:entry5 andEntry:entry3]);
+      [controller isSameDocumentNavigationBetweenItem:item5 andItem:item3]);
   EXPECT_TRUE(
-      [controller isSameDocumentNavigationBetweenEntry:entry4 andEntry:entry3]);
+      [controller isSameDocumentNavigationBetweenItem:item4 andItem:item3]);
   EXPECT_FALSE(
-      [controller isSameDocumentNavigationBetweenEntry:entry1 andEntry:entry2]);
+      [controller isSameDocumentNavigationBetweenItem:item1 andItem:item2]);
   EXPECT_FALSE(
-      [controller isSameDocumentNavigationBetweenEntry:entry0 andEntry:entry5]);
+      [controller isSameDocumentNavigationBetweenItem:item0 andItem:item5]);
   EXPECT_FALSE(
-      [controller isSameDocumentNavigationBetweenEntry:entry2 andEntry:entry4]);
+      [controller isSameDocumentNavigationBetweenItem:item2 andItem:item4]);
 }
 
 TEST_F(CRWSessionControllerTest, UpdateCurrentEntry) {
   std::vector<std::unique_ptr<web::NavigationItem>> items;
   items.push_back(CreateNavigationItem("http://www.firstpage.com",
                                        "http://www.starturl.com", @"First"));
   items.push_back(CreateNavigationItem("http://www.secondpage.com",
                                        "http://www.firstpage.com", @"Second"));
   items.push_back(CreateNavigationItem("http://www.thirdpage.com",
                                        "http://www.secondpage.com", @"Third"));
   base::scoped_nsobject<CRWSessionController> controller(
       [[CRWSessionController alloc] initWithNavigationItems:std::move(items)
                                                currentIndex:0
                                                browserState:&browser_state_]);
 
   GURL replacePageGurl1("http://www.firstpage.com/#replace1");
   NSString* stateObject1 = @"{'foo': 1}";
 
   // Replace current entry and check the size of history and fields of the
   // modified entry.
-  [controller updateCurrentEntryWithURL:replacePageGurl1
-                            stateObject:stateObject1];
+  [controller updateCurrentItemWithURL:replacePageGurl1
+                           stateObject:stateObject1];
   CRWSessionEntry* replacedEntry = [controller currentEntry];
   web::NavigationItemImpl* replacedItem = replacedEntry.navigationItemImpl;
   NSUInteger expectedCount = 3;
   EXPECT_EQ(expectedCount, controller.get().entries.count);
   EXPECT_EQ(replacePageGurl1, replacedEntry.navigationItem->GetURL());
   EXPECT_FALSE(replacedItem->IsCreatedFromPushState());
   EXPECT_NSEQ(stateObject1, replacedItem->GetSerializedStateObject());
   EXPECT_EQ(GURL("http://www.starturl.com/"),
             replacedEntry.navigationItem->GetReferrer().url);
 
   // Replace current entry and check size and fields again.
   GURL replacePageGurl2("http://www.firstpage.com/#replace2");
-  [controller.get() updateCurrentEntryWithURL:replacePageGurl2 stateObject:nil];
+  [controller.get() updateCurrentItemWithURL:replacePageGurl2 stateObject:nil];
   replacedEntry = [controller currentEntry];
   replacedItem = replacedEntry.navigationItemImpl;
   EXPECT_EQ(expectedCount, controller.get().entries.count);
   EXPECT_EQ(replacePageGurl2, replacedEntry.navigationItem->GetURL());
   EXPECT_FALSE(replacedItem->IsCreatedFromPushState());
   EXPECT_NSEQ(nil, replacedItem->GetSerializedStateObject());
   EXPECT_EQ(GURL("http://www.starturl.com/"),
             replacedEntry.navigationItem->GetReferrer().url);
 }
 
 TEST_F(CRWSessionControllerTest, TestBackwardForwardEntries) {
-  [session_controller_ addPendingEntry:GURL("http://www.example.com/0")
+  [session_controller_ addPendingItem:GURL("http://www.example.com/0")
                              referrer:MakeReferrer("http://www.example.com/a")
                            transition:ui::PAGE_TRANSITION_LINK
                     rendererInitiated:NO];
-  [session_controller_ commitPendingEntry];
-  [session_controller_ addPendingEntry:GURL("http://www.example.com/1")
+  [session_controller_ commitPendingItem];
+  [session_controller_ addPendingItem:GURL("http://www.example.com/1")
                              referrer:MakeReferrer("http://www.example.com/b")
                            transition:ui::PAGE_TRANSITION_LINK
                     rendererInitiated:NO];
-  [session_controller_ commitPendingEntry];
-  [session_controller_ addPendingEntry:GURL("http://www.example.com/redirect")
+  [session_controller_ commitPendingItem];
+  [session_controller_ addPendingItem:GURL("http://www.example.com/redirect")
                              referrer:MakeReferrer("http://www.example.com/r")
                            transition:ui::PAGE_TRANSITION_IS_REDIRECT_MASK
                     rendererInitiated:NO];
-  [session_controller_ commitPendingEntry];
-  [session_controller_ addPendingEntry:GURL("http://www.example.com/2")
+  [session_controller_ commitPendingItem];
+  [session_controller_ addPendingItem:GURL("http://www.example.com/2")
                              referrer:MakeReferrer("http://www.example.com/c")
                            transition:ui::PAGE_TRANSITION_LINK
                     rendererInitiated:NO];
-  [session_controller_ commitPendingEntry];
+  [session_controller_ commitPendingItem];
 
   EXPECT_EQ(3, session_controller_.get().currentNavigationIndex);
   NSArray* backEntries = [session_controller_ backwardEntries];
   EXPECT_EQ(2U, [backEntries count]);
   EXPECT_EQ(0U, [[session_controller_ forwardEntries] count]);
   EXPECT_EQ("http://www.example.com/redirect",
             [[backEntries objectAtIndex:0] navigationItem]->GetURL().spec());
 
-  [session_controller_ goToEntryAtIndex:1];
+  [session_controller_ goToItemAtIndex:1];
   EXPECT_EQ(1U, [[session_controller_ backwardEntries] count]);
   EXPECT_EQ(1U, [[session_controller_ forwardEntries] count]);
 
-  [session_controller_ goToEntryAtIndex:0];
+  [session_controller_ goToItemAtIndex:0];
   NSArray* forwardEntries = [session_controller_ forwardEntries];
   EXPECT_EQ(0U, [[session_controller_ backwardEntries] count]);
   EXPECT_EQ(2U, [forwardEntries count]);
   EXPECT_EQ("http://www.example.com/2",
             [[forwardEntries objectAtIndex:1] navigationItem]->GetURL().spec());
 }
 
 // Tests going to entries with existing and non-existing indices.
 TEST_F(CRWSessionControllerTest, GoToEntryAtIndex) {
-  [session_controller_ addPendingEntry:GURL("http://www.example.com/0")
+  [session_controller_ addPendingItem:GURL("http://www.example.com/0")
                              referrer:MakeReferrer("http://www.example.com/a")
                            transition:ui::PAGE_TRANSITION_LINK
                     rendererInitiated:NO];
-  [session_controller_ commitPendingEntry];
-  [session_controller_ addPendingEntry:GURL("http://www.example.com/1")
+  [session_controller_ commitPendingItem];
+  [session_controller_ addPendingItem:GURL("http://www.example.com/1")
                              referrer:MakeReferrer("http://www.example.com/b")
                            transition:ui::PAGE_TRANSITION_LINK
                     rendererInitiated:NO];
-  [session_controller_ commitPendingEntry];
-  [session_controller_ addPendingEntry:GURL("http://www.example.com/redirect")
+  [session_controller_ commitPendingItem];
+  [session_controller_ addPendingItem:GURL("http://www.example.com/redirect")
                              referrer:MakeReferrer("http://www.example.com/r")
                            transition:ui::PAGE_TRANSITION_IS_REDIRECT_MASK
                     rendererInitiated:NO];
-  [session_controller_ commitPendingEntry];
-  [session_controller_ addPendingEntry:GURL("http://www.example.com/2")
+  [session_controller_ commitPendingItem];
+  [session_controller_ addPendingItem:GURL("http://www.example.com/2")
                              referrer:MakeReferrer("http://www.example.com/c")
                            transition:ui::PAGE_TRANSITION_LINK
                     rendererInitiated:NO];
-  [session_controller_ commitPendingEntry];
-  [session_controller_ addPendingEntry:GURL("http://www.example.com/3")
-                              referrer:MakeReferrer("http://www.example.com/d")
-                            transition:ui::PAGE_TRANSITION_LINK
-                     rendererInitiated:NO];
-  [session_controller_ addTransientEntryWithURL:GURL("http://www.example.com")];
+  [session_controller_ commitPendingItem];
+  [session_controller_ addPendingItem:GURL("http://www.example.com/3")
+                             referrer:MakeReferrer("http://www.example.com/d")
+                           transition:ui::PAGE_TRANSITION_LINK
+                    rendererInitiated:NO];
+  [session_controller_ addTransientItemWithURL:GURL("http://www.example.com")];
   EXPECT_EQ(3, session_controller_.get().currentNavigationIndex);
   EXPECT_EQ(2, session_controller_.get().previousNavigationIndex);
   EXPECT_TRUE(session_controller_.get().pendingEntry);
   EXPECT_TRUE(session_controller_.get().transientEntry);
 
   // Going back should discard transient and pending entries.
-  [session_controller_ goToEntryAtIndex:1];
+  [session_controller_ goToItemAtIndex:1];
   EXPECT_EQ(1, session_controller_.get().currentNavigationIndex);
   EXPECT_EQ(3, session_controller_.get().previousNavigationIndex);
   EXPECT_FALSE(session_controller_.get().pendingEntry);
   EXPECT_FALSE(session_controller_.get().transientEntry);
 
   // Going forward should discard transient entry.
-  [session_controller_ addTransientEntryWithURL:GURL("http://www.example.com")];
+  [session_controller_ addTransientItemWithURL:GURL("http://www.example.com")];
   EXPECT_TRUE(session_controller_.get().transientEntry);
-  [session_controller_ goToEntryAtIndex:2];
+  [session_controller_ goToItemAtIndex:2];
   EXPECT_EQ(2, session_controller_.get().currentNavigationIndex);
   EXPECT_EQ(1, session_controller_.get().previousNavigationIndex);
   EXPECT_FALSE(session_controller_.get().transientEntry);
 
   // Out of bounds navigations should be no-op.
-  [session_controller_ goToEntryAtIndex:-1];
+  [session_controller_ goToItemAtIndex:-1];
   EXPECT_EQ(2, session_controller_.get().currentNavigationIndex);
   EXPECT_EQ(1, session_controller_.get().previousNavigationIndex);
-  [session_controller_ goToEntryAtIndex:NSIntegerMax];
+  [session_controller_ goToItemAtIndex:NSIntegerMax];
   EXPECT_EQ(2, session_controller_.get().currentNavigationIndex);
   EXPECT_EQ(1, session_controller_.get().previousNavigationIndex);
 
   // Going to current index should not change the previous index.
-  [session_controller_ goToEntryAtIndex:2];
+  [session_controller_ goToItemAtIndex:2];
   EXPECT_EQ(2, session_controller_.get().currentNavigationIndex);
   EXPECT_EQ(1, session_controller_.get().previousNavigationIndex);
 }
 
 // Tests that visible URL is the same as transient URL if there are no committed
 // entries.
 TEST_F(CRWSessionControllerTest, VisibleEntryWithSingleTransientEntry) {
-  [session_controller_ addTransientEntryWithURL:GURL("http://www.example.com")];
+  [session_controller_ addTransientItemWithURL:GURL("http://www.example.com")];
   web::NavigationItem* visible_item =
       [[session_controller_ visibleEntry] navigationItem];
   ASSERT_TRUE(visible_item);
   EXPECT_EQ("http://www.example.com/", visible_item->GetURL().spec());
 }
 
 // Tests that visible URL is the same as transient URL if there is a committed
 // entry.
 TEST_F(CRWSessionControllerTest, VisibleEntryWithCommittedAndTransientEntries) {
-  [session_controller_ addPendingEntry:GURL("http://www.example.com/0")
-                              referrer:MakeReferrer("http://www.example.com/a")
-                            transition:ui::PAGE_TRANSITION_LINK
-                     rendererInitiated:NO];
-  [session_controller_ commitPendingEntry];
-  [session_controller_ addTransientEntryWithURL:GURL("http://www.example.com")];
+  [session_controller_ addPendingItem:GURL("http://www.example.com/0")
+                             referrer:MakeReferrer("http://www.example.com/a")
+                           transition:ui::PAGE_TRANSITION_LINK
+                    rendererInitiated:NO];
+  [session_controller_ commitPendingItem];
+  [session_controller_ addTransientItemWithURL:GURL("http://www.example.com")];
   web::NavigationItem* visible_item =
       [[session_controller_ visibleEntry] navigationItem];
   ASSERT_TRUE(visible_item);
   EXPECT_EQ("http://www.example.com/", visible_item->GetURL().spec());
 }
 
 // Tests that visible URL is the same as pending URL if it was user-initiated.
 TEST_F(CRWSessionControllerTest,
        VisibleEntryWithSingleUserInitiatedPendingEntry) {
-  [session_controller_ addPendingEntry:GURL("http://www.example.com/0")
-                              referrer:MakeReferrer("http://www.example.com/a")
-                            transition:ui::PAGE_TRANSITION_LINK
-                     rendererInitiated:NO];
+  [session_controller_ addPendingItem:GURL("http://www.example.com/0")
+                             referrer:MakeReferrer("http://www.example.com/a")
+                           transition:ui::PAGE_TRANSITION_LINK
+                    rendererInitiated:NO];
   web::NavigationItem* visible_item =
       [[session_controller_ visibleEntry] navigationItem];
   ASSERT_TRUE(visible_item);
   EXPECT_EQ("http://www.example.com/0", visible_item->GetURL().spec());
 }
 
 // Tests that visible URL is the same as pending URL if it was user-initiated
 // and there is a committed entry.
 TEST_F(CRWSessionControllerTest,
        VisibleEntryWithCommittedAndUserInitiatedPendingEntry) {
-  [session_controller_ addPendingEntry:GURL("http://www.example.com")
-                              referrer:MakeReferrer("http://www.example.com/a")
-                            transition:ui::PAGE_TRANSITION_LINK
-                     rendererInitiated:NO];
-  [session_controller_ commitPendingEntry];
-  [session_controller_ addPendingEntry:GURL("http://www.example.com/0")
-                              referrer:MakeReferrer("http://www.example.com/b")
-                            transition:ui::PAGE_TRANSITION_LINK
-                     rendererInitiated:NO];
+  [session_controller_ addPendingItem:GURL("http://www.example.com")
+                             referrer:MakeReferrer("http://www.example.com/a")
+                           transition:ui::PAGE_TRANSITION_LINK
+                    rendererInitiated:NO];
+  [session_controller_ commitPendingItem];
+  [session_controller_ addPendingItem:GURL("http://www.example.com/0")
+                             referrer:MakeReferrer("http://www.example.com/b")
+                           transition:ui::PAGE_TRANSITION_LINK
+                    rendererInitiated:NO];
   web::NavigationItem* visible_item =
       [[session_controller_ visibleEntry] navigationItem];
   ASSERT_TRUE(visible_item);
   EXPECT_EQ("http://www.example.com/0", visible_item->GetURL().spec());
 }
 
 // Tests that visible URL is not the same as pending URL if it was
 // renderer-initiated.
 TEST_F(CRWSessionControllerTest,
        VisibleEntryWithSingleRendererInitiatedPendingEntry) {
-  [session_controller_ addPendingEntry:GURL("http://www.example.com/0")
-                              referrer:MakeReferrer("http://www.example.com/a")
-                            transition:ui::PAGE_TRANSITION_LINK
-                     rendererInitiated:YES];
+  [session_controller_ addPendingItem:GURL("http://www.example.com/0")
+                             referrer:MakeReferrer("http://www.example.com/a")
+                           transition:ui::PAGE_TRANSITION_LINK
+                    rendererInitiated:YES];
   web::NavigationItem* visible_item =
       [[session_controller_ visibleEntry] navigationItem];
   ASSERT_FALSE(visible_item);
 }
 
 // Tests that visible URL is not the same as pending URL if it was
 // renderer-initiated and there is a committed entry.
 TEST_F(CRWSessionControllerTest,
        VisibleEntryWithCommittedAndRendererInitiatedPendingEntry) {
-  [session_controller_ addPendingEntry:GURL("http://www.example.com")
-                              referrer:MakeReferrer("http://www.example.com/a")
-                            transition:ui::PAGE_TRANSITION_LINK
-                     rendererInitiated:YES];
-  [session_controller_ commitPendingEntry];
-  [session_controller_ addPendingEntry:GURL("http://www.example.com/0")
-                              referrer:MakeReferrer("http://www.example.com/b")
-                            transition:ui::PAGE_TRANSITION_LINK
-                     rendererInitiated:YES];
+  [session_controller_ addPendingItem:GURL("http://www.example.com")
+                             referrer:MakeReferrer("http://www.example.com/a")
+                           transition:ui::PAGE_TRANSITION_LINK
+                    rendererInitiated:YES];
+  [session_controller_ commitPendingItem];
+  [session_controller_ addPendingItem:GURL("http://www.example.com/0")
+                             referrer:MakeReferrer("http://www.example.com/b")
+                           transition:ui::PAGE_TRANSITION_LINK
+                    rendererInitiated:YES];
   web::NavigationItem* visible_item =
       [[session_controller_ visibleEntry] navigationItem];
   ASSERT_TRUE(visible_item);
   EXPECT_EQ("http://www.example.com/", visible_item->GetURL().spec());
 }
 
 // Tests that visible URL is not the same as pending URL created via pending
 // navigation index.
 TEST_F(CRWSessionControllerTest, VisibleEntryWithPendingNavigationIndex) {
-  [session_controller_ addPendingEntry:GURL("http://www.example.com")
-                              referrer:MakeReferrer("http://www.example.com/a")
-                            transition:ui::PAGE_TRANSITION_LINK
-                     rendererInitiated:NO];
-  [session_controller_ commitPendingEntry];
-  [session_controller_ addPendingEntry:GURL("http://www.example.com/0")
-                              referrer:MakeReferrer("http://www.example.com/b")
-                            transition:ui::PAGE_TRANSITION_LINK
-                     rendererInitiated:NO];
-  [session_controller_ commitPendingEntry];
+  [session_controller_ addPendingItem:GURL("http://www.example.com")
+                             referrer:MakeReferrer("http://www.example.com/a")
+                           transition:ui::PAGE_TRANSITION_LINK
+                    rendererInitiated:NO];
+  [session_controller_ commitPendingItem];
+  [session_controller_ addPendingItem:GURL("http://www.example.com/0")
+                             referrer:MakeReferrer("http://www.example.com/b")
+                           transition:ui::PAGE_TRANSITION_LINK
+                    rendererInitiated:NO];
+  [session_controller_ commitPendingItem];
 
-  [session_controller_ setPendingEntryIndex:0];
+  [session_controller_ setPendingItemIndex:0];
 
   web::NavigationItem* visible_item =
       [[session_controller_ visibleEntry] navigationItem];
   ASSERT_TRUE(visible_item);
   EXPECT_EQ("http://www.example.com/0", visible_item->GetURL().spec());
 }
 
 // Tests that |-backwardEntries| is empty if all preceding entries are
 // redirects.
 TEST_F(CRWSessionControllerTest, BackwardEntriesForAllRedirects) {
-  [session_controller_ addPendingEntry:GURL("http://www.example.com")
-                              referrer:MakeReferrer("http://www.example.com/a")
-                            transition:ui::PAGE_TRANSITION_CLIENT_REDIRECT
-                     rendererInitiated:YES];
-  [session_controller_ commitPendingEntry];
-  [session_controller_ addPendingEntry:GURL("http://www.example.com/0")
-                              referrer:MakeReferrer("http://www.example.com/b")
-                            transition:ui::PAGE_TRANSITION_CLIENT_REDIRECT
-                     rendererInitiated:YES];
-  [session_controller_ commitPendingEntry];
+  [session_controller_ addPendingItem:GURL("http://www.example.com")
+                             referrer:MakeReferrer("http://www.example.com/a")
+                           transition:ui::PAGE_TRANSITION_CLIENT_REDIRECT
+                    rendererInitiated:YES];
+  [session_controller_ commitPendingItem];
+  [session_controller_ addPendingItem:GURL("http://www.example.com/0")
+                             referrer:MakeReferrer("http://www.example.com/b")
+                           transition:ui::PAGE_TRANSITION_CLIENT_REDIRECT
+                    rendererInitiated:YES];
+  [session_controller_ commitPendingItem];
   EXPECT_EQ(0U, [session_controller_ backwardEntries].count);
 }
 
 }  // anonymous namespace