Remove CRWSessionEntry.

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 12 matching lines @@
 #import "testing/gtest_mac.h"
 #include "testing/platform_test.h"
 
 @interface CRWSessionController (Testing)
 - (const GURL&)URLForItemAtIndex:(size_t)index;
 - (const GURL&)currentURL;
 @end
 
 @implementation CRWSessionController (Testing)
 - (const GURL&)URLForItemAtIndex:(size_t)index {
-  web::NavigationItemList items = self.items;
-  if (index < items.size())
-    return items[index]->GetURL();
+  if (index < self.items.size())
+    return self.items[index]->GetURL();
   return GURL::EmptyGURL();
 }
 
 - (const GURL&)currentURL {
   return self.currentItem ? self.currentItem->GetURL() : GURL::EmptyGURL();
 }
 @end
 
 namespace {
 
@@ skipping 25 matching lines @@
   [session_controller_
       addPendingItem:GURL("http://www.example.com")
             referrer:web::Referrer()
           transition:ui::PAGE_TRANSITION_TYPED
       initiationType:web::NavigationInitiationType::USER_INITIATED];
   [session_controller_ commitPendingItem];
 
   EXPECT_EQ(-1, [session_controller_ pendingItemIndex]);
   [session_controller_ setPendingItemIndex:0];
   EXPECT_EQ(0, [session_controller_ pendingItemIndex]);
-  EXPECT_EQ([session_controller_ items].back(),
+  EXPECT_EQ([session_controller_ items].back().get(),
             [session_controller_ pendingItem]);
 }
 
 TEST_F(CRWSessionControllerTest, addPendingItem) {
   [session_controller_
       addPendingItem:GURL("http://www.url.com")
             referrer:MakeReferrer("http://www.referer.com")
           transition:ui::PAGE_TRANSITION_TYPED
       initiationType:web::NavigationInitiationType::USER_INITIATED];
 
@@ skipping 79 matching lines @@
   [session_controller_
       addPendingItem:GURL("http://www.url.com")
             referrer:MakeReferrer("http://www.referer.com")
           transition:ui::PAGE_TRANSITION_TYPED
       initiationType:web::NavigationInitiationType::USER_INITIATED];
   [session_controller_ commitPendingItem];
 
   EXPECT_EQ(1U, [session_controller_ items].size());
   EXPECT_EQ(GURL("http://www.url.com/"),
             [session_controller_ URLForItemAtIndex:0U]);
-  EXPECT_EQ([session_controller_ items].front(),
+  EXPECT_EQ([session_controller_ items].front().get(),
             [session_controller_ currentItem]);
 }
 
 TEST_F(CRWSessionControllerTest, addPendingItemOverridingAndCommit) {
   [session_controller_
       addPendingItem:GURL("http://www.url.com")
             referrer:MakeReferrer("http://www.referer.com")
           transition:ui::PAGE_TRANSITION_TYPED
       initiationType:web::NavigationInitiationType::USER_INITIATED];
   [session_controller_
       addPendingItem:GURL("http://www.another.url.com")
             referrer:MakeReferrer("http://www.another.referer.com")
           transition:ui::PAGE_TRANSITION_TYPED
       initiationType:web::NavigationInitiationType::USER_INITIATED];
   [session_controller_ commitPendingItem];
 
   EXPECT_EQ(1U, [session_controller_ items].size());
   EXPECT_EQ(GURL("http://www.another.url.com/"),
             [session_controller_ URLForItemAtIndex:0U]);
-  EXPECT_EQ([session_controller_ items].front(),
+  EXPECT_EQ([session_controller_ items].front().get(),
             [session_controller_ currentItem]);
 }
 
 TEST_F(CRWSessionControllerTest, addPendingItemAndCommitMultiple) {
   [session_controller_
       addPendingItem:GURL("http://www.url.com")
             referrer:MakeReferrer("http://www.referer.com")
           transition:ui::PAGE_TRANSITION_TYPED
       initiationType:web::NavigationInitiationType::USER_INITIATED];
   [session_controller_ commitPendingItem];
 
   [session_controller_
       addPendingItem:GURL("http://www.another.url.com")
             referrer:MakeReferrer("http://www.another.referer.com")
           transition:ui::PAGE_TRANSITION_TYPED
       initiationType:web::NavigationInitiationType::USER_INITIATED];
   [session_controller_ commitPendingItem];
 
   EXPECT_EQ(2U, [session_controller_ items].size());
   EXPECT_EQ(GURL("http://www.url.com/"),
             [session_controller_ URLForItemAtIndex:0U]);
   EXPECT_EQ(GURL("http://www.another.url.com/"),
             [session_controller_ URLForItemAtIndex:1U]);
-  EXPECT_EQ([session_controller_ items][1U], [session_controller_ currentItem]);
+  EXPECT_EQ([session_controller_ items][1U].get(),
+            [session_controller_ currentItem]);
 }
 
 TEST_F(CRWSessionControllerTest, addPendingItemAndDiscard) {
   [session_controller_
       addPendingItem:GURL("http://www.url.com")
             referrer:MakeReferrer("http://www.referer.com")
           transition:ui::PAGE_TRANSITION_TYPED
       initiationType:web::NavigationInitiationType::USER_INITIATED];
   [session_controller_ discardNonCommittedItems];
 
@@ skipping 30 matching lines @@
   [session_controller_
       addPendingItem:GURL("http://www.another.url.com")
             referrer:MakeReferrer("http://www.referer.com")
           transition:ui::PAGE_TRANSITION_TYPED
       initiationType:web::NavigationInitiationType::USER_INITIATED];
   [session_controller_ commitPendingItem];
 
   EXPECT_EQ(1U, [session_controller_ items].size());
   EXPECT_EQ(GURL("http://www.another.url.com/"),
             [session_controller_ URLForItemAtIndex:0U]);
-  EXPECT_EQ([session_controller_ items].front(),
+  EXPECT_EQ([session_controller_ items].front().get(),
             [session_controller_ currentItem]);
 }
 
 TEST_F(CRWSessionControllerTest, addPendingItemAndCommitAndAddAndDiscard) {
   [session_controller_
       addPendingItem:GURL("http://www.url.com")
             referrer:MakeReferrer("http://www.referer.com")
           transition:ui::PAGE_TRANSITION_TYPED
       initiationType:web::NavigationInitiationType::USER_INITIATED];
   [session_controller_ commitPendingItem];
 
   [session_controller_
       addPendingItem:GURL("http://www.another.url.com")
             referrer:MakeReferrer("http://www.referer.com")
           transition:ui::PAGE_TRANSITION_TYPED
       initiationType:web::NavigationInitiationType::USER_INITIATED];
   [session_controller_ discardNonCommittedItems];
 
   EXPECT_EQ(1U, [session_controller_ items].size());
   EXPECT_EQ(GURL("http://www.url.com/"),
             [session_controller_ URLForItemAtIndex:0U]);
-  EXPECT_EQ([session_controller_ items].front(),
+  EXPECT_EQ([session_controller_ items].front().get(),
             [session_controller_ currentItem]);
 }
 
 TEST_F(CRWSessionControllerTest,
        commitPendingItemWithoutPendingOrCommittedItem) {
   [session_controller_ commitPendingItem];
 
   EXPECT_TRUE([session_controller_ items].empty());
   EXPECT_FALSE([session_controller_ currentItem]);
 }
 
 TEST_F(CRWSessionControllerTest,
        commitPendingItemWithoutPendingItemWithCommittedItem) {
   // Setup committed item.
   [session_controller_
-      addPendingItem:GURL("http://www.url.com")
-            referrer:MakeReferrer("http://www.referer.com")
+      addPendingItem:GURL("http://www.url.com/")
+            referrer:MakeReferrer("http://www.referrer.com/")
           transition:ui::PAGE_TRANSITION_TYPED
       initiationType:web::NavigationInitiationType::USER_INITIATED];
   [session_controller_ commitPendingItem];
 
   // Commit pending item when there is no such one
   [session_controller_ commitPendingItem];
 
   EXPECT_EQ(1U, [session_controller_ items].size());
-  EXPECT_EQ([session_controller_ items].front(),
+  EXPECT_EQ([session_controller_ items].front().get(),
             [session_controller_ currentItem]);
 }
 
-// Tests that forward entries are discarded after navigation item is committed.
+// Tests that forward items are discarded after navigation item is committed.
 TEST_F(CRWSessionControllerTest, commitPendingItemWithExistingForwardItems) {
-  // Make 3 entries.
+  // Make 3 items.
   [session_controller_
       addPendingItem:GURL("http://www.example.com/0")
             referrer:MakeReferrer("http://www.example.com/a")
           transition:ui::PAGE_TRANSITION_LINK
       initiationType:web::NavigationInitiationType::RENDERER_INITIATED];
   [session_controller_ commitPendingItem];
   [session_controller_
       addPendingItem:GURL("http://www.example.com/1")
             referrer:MakeReferrer("http://www.example.com/b")
           transition:ui::PAGE_TRANSITION_LINK
@@ skipping 10 matching lines @@
   [session_controller_ goToItemAtIndex:0];
 
   // Create and commit a new pending item.
   [session_controller_
       addPendingItem:GURL("http://www.example.com/2")
             referrer:MakeReferrer("http://www.example.com/c")
           transition:ui::PAGE_TRANSITION_LINK
       initiationType:web::NavigationInitiationType::RENDERER_INITIATED];
   [session_controller_ commitPendingItem];
 
-  // All forward entries should go away.
+  // All forward items should go away.
   EXPECT_EQ(2U, [session_controller_ items].size());
   EXPECT_EQ(0U, [session_controller_ forwardItems].size());
   ASSERT_EQ(1, [session_controller_ currentNavigationIndex]);
   ASSERT_EQ(0, [session_controller_ previousNavigationIndex]);
 }
 
 // Tests committing pending item index from the middle.
 TEST_F(CRWSessionControllerTest, commitPendingItemIndex) {
   [session_controller_
       addPendingItem:GURL("http://www.example.com/0")
@@ skipping 12 matching lines @@
             referrer:web::Referrer()
           transition:ui::PAGE_TRANSITION_TYPED
       initiationType:web::NavigationInitiationType::USER_INITIATED];
   [session_controller_ commitPendingItem];
   ASSERT_EQ(3U, [session_controller_ items].size());
 
   // Go to the middle, and commit first pending item index.
   [session_controller_ goToItemAtIndex:1];
   [session_controller_ setPendingItemIndex:0];
   ASSERT_EQ(0, [session_controller_ pendingItemIndex]);
-  web::NavigationItem* pendingItem = [session_controller_ pendingItem];
-  ASSERT_TRUE(pendingItem);
+  web::NavigationItem* pending_item = [session_controller_ pendingItem];
+  ASSERT_TRUE(pending_item);
   ASSERT_EQ(1, [session_controller_ currentNavigationIndex]);
   EXPECT_EQ(2, [session_controller_ previousNavigationIndex]);
   [session_controller_ commitPendingItem];
 
   // Verify that pending item has been committed and current and previous item
   // indices updated.
-  EXPECT_EQ([session_controller_ lastCommittedItem], pendingItem);
+  EXPECT_EQ(pending_item, [session_controller_ lastCommittedItem]);
   EXPECT_EQ(-1, [session_controller_ pendingItemIndex]);
   EXPECT_FALSE([session_controller_ pendingItem]);
   EXPECT_EQ(0, [session_controller_ currentNavigationIndex]);
   EXPECT_EQ(1, [session_controller_ previousNavigationIndex]);
   EXPECT_EQ(3U, [session_controller_ items].size());
 }
 
 TEST_F(CRWSessionControllerTest,
        DiscardPendingItemWithoutPendingOrCommittedItem) {
   [session_controller_ discardNonCommittedItems];
 
   EXPECT_TRUE([session_controller_ items].empty());
   EXPECT_FALSE([session_controller_ currentItem]);
 }
 
 TEST_F(CRWSessionControllerTest,
        DiscardPendingItemWithoutPendingItemWithCommittedItem) {
   // Setup committed item
   [session_controller_
       addPendingItem:GURL("http://www.url.com")
             referrer:MakeReferrer("http://www.referer.com")
           transition:ui::PAGE_TRANSITION_TYPED
       initiationType:web::NavigationInitiationType::USER_INITIATED];
   [session_controller_ commitPendingItem];
 
-  // Discard noncommitted entries when there is no such one
+  // Discard noncommitted items when there is no such one
   [session_controller_ discardNonCommittedItems];
 
   EXPECT_EQ(1U, [session_controller_ items].size());
-  EXPECT_EQ([session_controller_ items].front(),
+  EXPECT_EQ([session_controller_ items].front().get(),
             [session_controller_ currentItem]);
 }
 
 TEST_F(CRWSessionControllerTest, updatePendingItemWithoutPendingItem) {
   [session_controller_ updatePendingItem:GURL("http://www.another.url.com")];
   [session_controller_ commitPendingItem];
 
   EXPECT_TRUE([session_controller_ items].empty());
   EXPECT_FALSE([session_controller_ currentItem]);
 }
@@ skipping 18 matching lines @@
             referrer:MakeReferrer("http://www.referer.com")
           transition:ui::PAGE_TRANSITION_TYPED
       initiationType:web::NavigationInitiationType::USER_INITIATED];
   [session_controller_ commitPendingItem];
   [session_controller_ updatePendingItem:GURL("http://www.another.url.com")];
   [session_controller_ commitPendingItem];
 
   EXPECT_EQ(1U, [session_controller_ items].size());
   EXPECT_EQ(GURL("http://www.url.com/"),
             [session_controller_ URLForItemAtIndex:0U]);
-  EXPECT_EQ([session_controller_ items].front(),
+  EXPECT_EQ([session_controller_ items].front().get(),
             [session_controller_ currentItem]);
 }
 
 // Tests inserting session controller state.
 TEST_F(CRWSessionControllerTest, InsertState) {
   // Add 1 committed and 1 pending item to target controller.
   [session_controller_
       addPendingItem:GURL("http://www.url.com/2")
             referrer:web::Referrer()
           transition:ui::PAGE_TRANSITION_TYPED
@@ skipping 33 matching lines @@
   EXPECT_EQ(GURL("http://www.url.com/0"),
             [session_controller_ URLForItemAtIndex:0]);
   EXPECT_EQ(GURL("http://www.url.com/2"),
             [session_controller_ URLForItemAtIndex:1]);
   EXPECT_EQ(GURL("http://www.url.com/3"),
             [session_controller_ pendingItem]->GetURL());
 }
 
 // Tests inserting session controller state from empty session controller.
 TEST_F(CRWSessionControllerTest, InsertStateFromEmptySessionController) {
-  // Add 2 committed entries to target controller.
+  // Add 2 committed items to target controller.
   [session_controller_
       addPendingItem:GURL("http://www.url.com/0")
             referrer:web::Referrer()
           transition:ui::PAGE_TRANSITION_TYPED
       initiationType:web::NavigationInitiationType::USER_INITIATED];
   [session_controller_ commitPendingItem];
   [session_controller_
       addPendingItem:GURL("http://www.url.com/1")
             referrer:web::Referrer()
           transition:ui::PAGE_TRANSITION_TYPED
@@ skipping 14 matching lines @@
   EXPECT_EQ(-1, [session_controller_ pendingItemIndex]);
   EXPECT_FALSE([session_controller_ pendingItem]);
   EXPECT_EQ(GURL("http://www.url.com/0"),
             [session_controller_ URLForItemAtIndex:0]);
   EXPECT_EQ(GURL("http://www.url.com/1"),
             [session_controller_ URLForItemAtIndex:1]);
 }
 
 // Tests inserting session controller state to empty session controller.
 TEST_F(CRWSessionControllerTest, InsertStateToEmptySessionController) {
-  // Create source session controller with 2 committed entries and one
+  // Create source session controller with 2 committed items and one
   // pending item.
   base::scoped_nsobject<CRWSessionController> other_session_controller(
       [[CRWSessionController alloc] initWithBrowserState:&browser_state_
                                              openedByDOM:NO]);
   [other_session_controller
       addPendingItem:GURL("http://www.url.com/0")
             referrer:web::Referrer()
           transition:ui::PAGE_TRANSITION_TYPED
       initiationType:web::NavigationInitiationType::USER_INITIATED];
   [other_session_controller commitPendingItem];
@@ skipping 21 matching lines @@
   EXPECT_EQ(GURL("http://www.url.com/0"),
             [session_controller_ URLForItemAtIndex:0]);
   EXPECT_EQ(GURL("http://www.url.com/1"),
             [session_controller_ URLForItemAtIndex:1]);
 }
 
 // Tests inserting session controller state. Verifies that pending item index
 // remains valid.
 TEST_F(CRWSessionControllerTest,
        InsertStateWithPendingItemIndexInTargetController) {
-  // Add 2 committed entries and make the first item pending.
+  // Add 2 committed items and make the first item pending.
   [session_controller_
       addPendingItem:GURL("http://www.url.com/2")
             referrer:web::Referrer()
           transition:ui::PAGE_TRANSITION_TYPED
       initiationType:web::NavigationInitiationType::USER_INITIATED];
   [session_controller_ commitPendingItem];
   [session_controller_
       addPendingItem:GURL("http://www.url.com/3")
             referrer:web::Referrer()
           transition:ui::PAGE_TRANSITION_TYPED
@@ skipping 32 matching lines @@
 TEST_F(CRWSessionControllerTest, EmptyController) {
   EXPECT_TRUE([session_controller_ items].empty());
   EXPECT_EQ(-1, [session_controller_ currentNavigationIndex]);
   EXPECT_EQ(-1, [session_controller_ previousNavigationIndex]);
   EXPECT_FALSE([session_controller_ currentItem]);
   EXPECT_FALSE([session_controller_ pendingItem]);
   EXPECT_EQ(-1, [session_controller_ pendingItemIndex]);
 }
 
 // Helper to create a NavigationItem.
-std::unique_ptr<web::NavigationItemImpl> CreateNavigationItem(
+std::unique_ptr<web::NavigationItem> 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 =
       base::MakeUnique<web::NavigationItemImpl>();
   navigation_item->SetURL(GURL(url));
   navigation_item->SetReferrer(referrer_object);
   navigation_item->SetTitle(base::SysNSStringToUTF16(title));
   navigation_item->SetTransitionType(ui::PAGE_TRANSITION_TYPED);
 
-  return navigation_item;
+  // XCode clang doesn't correctly handle implicit unique_ptr casting for
+  // returned values, so manually cast here.
+  std::unique_ptr<web::NavigationItem> item(
+      static_cast<web::NavigationItem*>(navigation_item.release()));
+  return item;
 }
 
 TEST_F(CRWSessionControllerTest, CreateWithEmptyNavigations) {
   std::vector<std::unique_ptr<web::NavigationItem>> items;
   base::scoped_nsobject<CRWSessionController> controller(
       [[CRWSessionController alloc] initWithBrowserState:&browser_state_
                                          navigationItems:std::move(items)
                                             currentIndex:0]);
   EXPECT_TRUE(controller.get().items.empty());
   EXPECT_EQ(controller.get().currentNavigationIndex, -1);
@@ skipping 10 matching lines @@
   items.push_back(CreateNavigationItem("http://www.espn.com",
                                        "http://www.nothing.com", @"ESPN"));
   base::scoped_nsobject<CRWSessionController> controller(
       [[CRWSessionController alloc] initWithBrowserState:&browser_state_
                                          navigationItems:std::move(items)
                                             currentIndex:1]);
 
   EXPECT_EQ(controller.get().items.size(), 3U);
   EXPECT_EQ(controller.get().currentNavigationIndex, 1);
   EXPECT_EQ(controller.get().previousNavigationIndex, -1);
-  // Sanity check the current item, the CRWSessionItem unit test will ensure
+  // Sanity check the current item, the NavigationItem unit test will ensure
   // the entire object is created properly.
-  EXPECT_EQ(controller.get().currentItem->GetURL(),
-            GURL("http://www.yahoo.com"));
+  EXPECT_EQ([controller currentItem]->GetURL(), GURL("http://www.yahoo.com"));
 }
 
 // Tests index of previous navigation item.
 TEST_F(CRWSessionControllerTest, PreviousNavigationItem) {
   EXPECT_EQ(session_controller_.get().previousNavigationIndex, -1);
   [session_controller_
       addPendingItem:GURL("http://www.url.com")
             referrer:MakeReferrer("http://www.referer.com")
           transition:ui::PAGE_TRANSITION_TYPED
       initiationType:web::NavigationInitiationType::USER_INITIATED];
@@ skipping 82 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] initWithBrowserState:&browser_state_
                                          navigationItems:std::move(items)
                                             currentIndex:0]);
-  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]);
+  web::NavigationItemImpl* item0 = [controller items][0].get();
+  web::NavigationItemImpl* item1 = [controller items][1].get();
+  web::NavigationItemImpl* item2 = [controller items][2].get();
+  web::NavigationItemImpl* item3 = [controller items][3].get();
+  web::NavigationItemImpl* item4 = [controller items][4].get();
+  web::NavigationItemImpl* item5 = [controller items][5].get();
   item1->SetIsCreatedFromPushState(true);
   item4->SetIsCreatedFromHashChange(true);
   item5->SetIsCreatedFromPushState(true);
 
   EXPECT_FALSE(
       [controller isSameDocumentNavigationBetweenItem:item0 andItem:item0]);
   EXPECT_TRUE(
       [controller isSameDocumentNavigationBetweenItem:item0 andItem:item1]);
   EXPECT_TRUE(
       [controller isSameDocumentNavigationBetweenItem:item5 andItem:item3]);
@@ skipping 82 matching lines @@
   EXPECT_EQ(1U, [session_controller_ backwardItems].size());
   EXPECT_EQ(1U, [session_controller_ forwardItems].size());
 
   [session_controller_ goToItemAtIndex:0];
   web::NavigationItemList forwardItems = [session_controller_ forwardItems];
   EXPECT_EQ(0U, [session_controller_ backwardItems].size());
   EXPECT_EQ(2U, forwardItems.size());
   EXPECT_EQ("http://www.example.com/2", forwardItems[1]->GetURL().spec());
 }
 
-// Tests going to entries with existing and non-existing indices.
+// Tests going to items with existing and non-existing indices.
 TEST_F(CRWSessionControllerTest, GoToItemAtIndex) {
   [session_controller_
       addPendingItem:GURL("http://www.example.com/0")
             referrer:MakeReferrer("http://www.example.com/a")
           transition:ui::PAGE_TRANSITION_LINK
       initiationType:web::NavigationInitiationType::USER_INITIATED];
   [session_controller_ commitPendingItem];
   [session_controller_
       addPendingItem:GURL("http://www.example.com/1")
             referrer:MakeReferrer("http://www.example.com/b")
@@ skipping 16 matching lines @@
       addPendingItem:GURL("http://www.example.com/3")
             referrer:MakeReferrer("http://www.example.com/d")
           transition:ui::PAGE_TRANSITION_LINK
       initiationType:web::NavigationInitiationType::USER_INITIATED];
   [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_ pendingItem]);
   EXPECT_TRUE([session_controller_ transientItem]);
 
-  // Going back should discard transient and pending entries.
+  // Going back should discard transient and pending items.
   [session_controller_ goToItemAtIndex:1];
   EXPECT_EQ(1, session_controller_.get().currentNavigationIndex);
   EXPECT_EQ(3, session_controller_.get().previousNavigationIndex);
-  EXPECT_FALSE([session_controller_ pendingItem]);
-  EXPECT_FALSE([session_controller_ transientItem]);
+  EXPECT_FALSE(session_controller_.get().pendingItem);
+  EXPECT_FALSE(session_controller_.get().transientItem);
 
   // Going forward should discard transient item.
   [session_controller_ addTransientItemWithURL:GURL("http://www.example.com")];
-  EXPECT_TRUE([session_controller_ transientItem]);
+  EXPECT_TRUE(session_controller_.get().transientItem);
   [session_controller_ goToItemAtIndex:2];
   EXPECT_EQ(2, session_controller_.get().currentNavigationIndex);
   EXPECT_EQ(1, session_controller_.get().previousNavigationIndex);
-  EXPECT_FALSE([session_controller_ transientItem]);
+  EXPECT_FALSE(session_controller_.get().transientItem);
 
   // Out of bounds navigations should be no-op.
   [session_controller_ goToItemAtIndex:-1];
   EXPECT_EQ(2, session_controller_.get().currentNavigationIndex);
   EXPECT_EQ(1, session_controller_.get().previousNavigationIndex);
   [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_ 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.
+// items.
 TEST_F(CRWSessionControllerTest, VisibleItemWithSingleTransientItem) {
   [session_controller_ addTransientItemWithURL:GURL("http://www.example.com")];
   web::NavigationItem* visible_item = [session_controller_ visibleItem];
   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
 // item.
 TEST_F(CRWSessionControllerTest, VisibleItemWithCommittedAndTransientItems) {
@@ skipping 91 matching lines @@
       initiationType:web::NavigationInitiationType::USER_INITIATED];
   [session_controller_ commitPendingItem];
 
   [session_controller_ setPendingItemIndex:0];
 
   web::NavigationItem* visible_item = [session_controller_ visibleItem];
   ASSERT_TRUE(visible_item);
   EXPECT_EQ("http://www.example.com/0", visible_item->GetURL().spec());
 }
 
-// Tests that |-backwardItems| is empty if all preceding entries are
+// Tests that |-backwardItems| is empty if all preceding items are
 // redirects.
 TEST_F(CRWSessionControllerTest, BackwardItemsForAllRedirects) {
   [session_controller_
       addPendingItem:GURL("http://www.example.com")
             referrer:MakeReferrer("http://www.example.com/a")
           transition:ui::PAGE_TRANSITION_CLIENT_REDIRECT
       initiationType:web::NavigationInitiationType::RENDERER_INITIATED];
   [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
       initiationType:web::NavigationInitiationType::RENDERER_INITIATED];
   [session_controller_ commitPendingItem];
   EXPECT_EQ(0U, [session_controller_ backwardItems].size());
 }
 
 }  // anonymous namespace