[ObjC ARC] Converts ios/web:ios_web_navigation_unittests to ARC.

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>
 
 #include "base/logging.h"
-#import "base/mac/scoped_nsobject.h"
 #include "base/memory/ptr_util.h"
 #include "base/strings/sys_string_conversions.h"
 #import "ios/web/navigation/crw_session_controller+private_constructors.h"
 #import "ios/web/navigation/navigation_item_impl.h"
 #import "ios/web/navigation/navigation_manager_impl.h"
 #include "ios/web/public/referrer.h"
 #include "ios/web/public/test/fakes/test_browser_state.h"
 #include "ios/web/public/test/test_web_thread_bundle.h"
 #import "net/base/mac/url_conversions.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #import "testing/gtest_mac.h"
 #include "testing/platform_test.h"
 
+#if !defined(__has_feature) || !__has_feature(objc_arc)
+#error "This file requires ARC support."
+#endif
+
 using UserAgentOverrideOption = web::NavigationManager::UserAgentOverrideOption;
 
 @interface CRWSessionController (Testing)
 - (const GURL&)URLForItemAtIndex:(size_t)index;
 - (const GURL&)currentURL;
 @end
 
 @implementation CRWSessionController (Testing)
 - (const GURL&)URLForItemAtIndex:(size_t)index {
   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 {
 
 class CRWSessionControllerTest : public PlatformTest {
  protected:
   void SetUp() override {
-    session_controller_.reset(
-        [[CRWSessionController alloc] initWithBrowserState:&browser_state_]);
+    session_controller_ =
+        [[CRWSessionController alloc] initWithBrowserState:&browser_state_];
   }
 
   web::Referrer MakeReferrer(const std::string& url) {
     return web::Referrer(GURL(url), web::ReferrerPolicyDefault);
   }
 
   web::TestWebThreadBundle thread_bundle_;
   web::TestBrowserState browser_state_;
-  base::scoped_nsobject<CRWSessionController> session_controller_;
+  CRWSessionController* session_controller_;
 };
 
 TEST_F(CRWSessionControllerTest, Init) {
   EXPECT_TRUE([session_controller_ items].empty());
   EXPECT_FALSE([session_controller_ currentItem]);
 }
 
 // Tests session controller state after setting a pending index.
 TEST_F(CRWSessionControllerTest, SetPendingIndex) {
   [session_controller_
@@ skipping 443 matching lines @@
       userAgentOverrideOption:UserAgentOverrideOption::INHERIT];
   [session_controller_ commitPendingItem];
   [session_controller_
                addPendingItem:GURL("http://www.url.com/3")
                      referrer:web::Referrer()
                    transition:ui::PAGE_TRANSITION_TYPED
                initiationType:web::NavigationInitiationType::USER_INITIATED
       userAgentOverrideOption:UserAgentOverrideOption::INHERIT];
 
   // Create source session controller with 1 committed item.
-  base::scoped_nsobject<CRWSessionController> other_session_controller(
-      [[CRWSessionController alloc] initWithBrowserState:&browser_state_]);
+  CRWSessionController* other_session_controller =
+      [[CRWSessionController alloc] initWithBrowserState:&browser_state_];
   [other_session_controller
                addPendingItem:GURL("http://www.url.com/0")
                      referrer:web::Referrer()
                    transition:ui::PAGE_TRANSITION_TYPED
                initiationType:web::NavigationInitiationType::USER_INITIATED
       userAgentOverrideOption:UserAgentOverrideOption::INHERIT];
   [other_session_controller commitPendingItem];
   [other_session_controller
                addPendingItem:GURL("http://www.url.com/1")
                      referrer:web::Referrer()
                    transition:ui::PAGE_TRANSITION_TYPED
                initiationType:web::NavigationInitiationType::USER_INITIATED
       userAgentOverrideOption:UserAgentOverrideOption::INHERIT];
 
   // Insert and verify the state of target session controller.
   EXPECT_TRUE([session_controller_ canPruneAllButLastCommittedItem]);
   [session_controller_
-      copyStateFromSessionControllerAndPrune:other_session_controller.get()];
+      copyStateFromSessionControllerAndPrune:other_session_controller];
 
   EXPECT_EQ(2U, [session_controller_ items].size());
   EXPECT_EQ(1, [session_controller_ lastCommittedItemIndex]);
   EXPECT_EQ(-1, [session_controller_ previousItemIndex]);
   EXPECT_EQ(-1, [session_controller_ pendingItemIndex]);
 
   EXPECT_EQ(GURL("http://www.url.com/0"),
             [session_controller_ URLForItemAtIndex:0]);
   EXPECT_EQ(GURL("http://www.url.com/2"),
             [session_controller_ URLForItemAtIndex:1]);
@@ skipping 13 matching lines @@
   [session_controller_ commitPendingItem];
   [session_controller_
                addPendingItem:GURL("http://www.url.com/1")
                      referrer:web::Referrer()
                    transition:ui::PAGE_TRANSITION_TYPED
                initiationType:web::NavigationInitiationType::USER_INITIATED
       userAgentOverrideOption:UserAgentOverrideOption::INHERIT];
   [session_controller_ commitPendingItem];
 
   // Create empty source session controller.
-  base::scoped_nsobject<CRWSessionController> other_session_controller(
-      [[CRWSessionController alloc] initWithBrowserState:&browser_state_]);
+  CRWSessionController* other_session_controller =
+      [[CRWSessionController alloc] initWithBrowserState:&browser_state_];
 
   // Insert and verify the state of target session controller.
   EXPECT_TRUE([session_controller_ canPruneAllButLastCommittedItem]);
   [session_controller_
-      copyStateFromSessionControllerAndPrune:other_session_controller.get()];
+      copyStateFromSessionControllerAndPrune:other_session_controller];
   EXPECT_EQ(2U, [session_controller_ items].size());
   EXPECT_EQ(1, [session_controller_ lastCommittedItemIndex]);
   EXPECT_EQ(0, [session_controller_ previousItemIndex]);
   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 that |-copyStateFromSessionControllerAndPrune:| is a no-op when the
 // receiver has no last committed item.
 TEST_F(CRWSessionControllerTest, CopyStateToEmptySessionController) {
   EXPECT_FALSE([session_controller_ canPruneAllButLastCommittedItem]);
 
   // Create source session controller with 1 committed item.
-  base::scoped_nsobject<CRWSessionController> other_session_controller(
-      [[CRWSessionController alloc] initWithBrowserState:&browser_state_]);
+  CRWSessionController* other_session_controller =
+      [[CRWSessionController alloc] initWithBrowserState:&browser_state_];
   [other_session_controller
                addPendingItem:GURL("http://www.url.com/0")
                      referrer:web::Referrer()
                    transition:ui::PAGE_TRANSITION_TYPED
                initiationType:web::NavigationInitiationType::USER_INITIATED
       userAgentOverrideOption:UserAgentOverrideOption::INHERIT];
   [other_session_controller commitPendingItem];
   [other_session_controller
                addPendingItem:GURL("http://www.url.com/1")
                      referrer:web::Referrer()
@@ skipping 26 matching lines @@
   [session_controller_ commitPendingItem];
   [session_controller_
                addPendingItem:GURL("http://www.url.com/2")
                      referrer:web::Referrer()
                    transition:ui::PAGE_TRANSITION_TYPED
                initiationType:web::NavigationInitiationType::USER_INITIATED
       userAgentOverrideOption:UserAgentOverrideOption::INHERIT];
   [session_controller_ commitPendingItem];
 
   // Create source session controller with 1 committed item.
-  base::scoped_nsobject<CRWSessionController> other_session_controller(
-      [[CRWSessionController alloc] initWithBrowserState:&browser_state_]);
+  CRWSessionController* other_session_controller =
+      [[CRWSessionController alloc] initWithBrowserState:&browser_state_];
   [other_session_controller
                addPendingItem:GURL("http://www.url.com/0")
                      referrer:web::Referrer()
                    transition:ui::PAGE_TRANSITION_TYPED
                initiationType:web::NavigationInitiationType::USER_INITIATED
       userAgentOverrideOption:UserAgentOverrideOption::INHERIT];
   [other_session_controller commitPendingItem];
   [other_session_controller
                addPendingItem:GURL("http://www.url.com/1")
                      referrer:web::Referrer()
@@ skipping 32 matching lines @@
   GURL second_url = GURL("http://www.url.com/2");
   [session_controller_
                addPendingItem:second_url
                      referrer:web::Referrer()
                    transition:ui::PAGE_TRANSITION_TYPED
                initiationType:web::NavigationInitiationType::USER_INITIATED
       userAgentOverrideOption:UserAgentOverrideOption::INHERIT];
   [session_controller_ addTransientItemWithURL:second_url];
 
   // Create source session controller with 1 committed item.
-  base::scoped_nsobject<CRWSessionController> other_session_controller(
-      [[CRWSessionController alloc] initWithBrowserState:&browser_state_]);
+  CRWSessionController* other_session_controller =
+      [[CRWSessionController alloc] initWithBrowserState:&browser_state_];
   [other_session_controller
                addPendingItem:GURL("http://www.url.com/0")
                      referrer:web::Referrer()
                    transition:ui::PAGE_TRANSITION_TYPED
                initiationType:web::NavigationInitiationType::USER_INITIATED
       userAgentOverrideOption:UserAgentOverrideOption::INHERIT];
   [other_session_controller commitPendingItem];
   [other_session_controller
                addPendingItem:GURL("http://www.url.com/1")
                      referrer:web::Referrer()
@@ skipping 42 matching lines @@
 
   // 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* controller =
       [[CRWSessionController alloc] initWithBrowserState:&browser_state_
                                          navigationItems:std::move(items)
-                                  lastCommittedItemIndex:0]);
-  EXPECT_TRUE(controller.get().items.empty());
-  EXPECT_EQ(controller.get().lastCommittedItemIndex, -1);
-  EXPECT_EQ(controller.get().previousItemIndex, -1);
-  EXPECT_FALSE(controller.get().currentItem);
+                                  lastCommittedItemIndex:0];
+  EXPECT_TRUE(controller.items.empty());
+  EXPECT_EQ(controller.lastCommittedItemIndex, -1);
+  EXPECT_EQ(controller.previousItemIndex, -1);
+  EXPECT_FALSE(controller.currentItem);
 }
 
 TEST_F(CRWSessionControllerTest, CreateWithNavList) {
   std::vector<std::unique_ptr<web::NavigationItem>> items;
   items.push_back(CreateNavigationItem("http://www.google.com",
                                        "http://www.referrer.com", @"Google"));
   items.push_back(CreateNavigationItem("http://www.yahoo.com",
                                        "http://www.google.com", @"Yahoo"));
   items.push_back(CreateNavigationItem("http://www.espn.com",
                                        "http://www.nothing.com", @"ESPN"));
-  base::scoped_nsobject<CRWSessionController> controller(
+  CRWSessionController* controller =
       [[CRWSessionController alloc] initWithBrowserState:&browser_state_
                                          navigationItems:std::move(items)
-                                  lastCommittedItemIndex:1]);
+                                  lastCommittedItemIndex:1];
 
-  EXPECT_EQ(controller.get().items.size(), 3U);
-  EXPECT_EQ(controller.get().lastCommittedItemIndex, 1);
-  EXPECT_EQ(controller.get().previousItemIndex, -1);
+  EXPECT_EQ(controller.items.size(), 3U);
+  EXPECT_EQ(controller.lastCommittedItemIndex, 1);
+  EXPECT_EQ(controller.previousItemIndex, -1);
   // Sanity check the current item, the NavigationItem unit test will ensure
   // the entire object is created properly.
   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().previousItemIndex, -1);
+  EXPECT_EQ(session_controller_.previousItemIndex, -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
       userAgentOverrideOption:UserAgentOverrideOption::INHERIT];
   [session_controller_ commitPendingItem];
-  EXPECT_EQ(session_controller_.get().previousItemIndex, -1);
+  EXPECT_EQ(session_controller_.previousItemIndex, -1);
   [session_controller_
                addPendingItem:GURL("http://www.url1.com")
                      referrer:MakeReferrer("http://www.referer.com")
                    transition:ui::PAGE_TRANSITION_TYPED
                initiationType:web::NavigationInitiationType::USER_INITIATED
       userAgentOverrideOption:UserAgentOverrideOption::INHERIT];
   [session_controller_ commitPendingItem];
-  EXPECT_EQ(session_controller_.get().previousItemIndex, 0);
+  EXPECT_EQ(session_controller_.previousItemIndex, 0);
   [session_controller_
                addPendingItem:GURL("http://www.url2.com")
                      referrer:MakeReferrer("http://www.referer.com")
                    transition:ui::PAGE_TRANSITION_TYPED
                initiationType:web::NavigationInitiationType::USER_INITIATED
       userAgentOverrideOption:UserAgentOverrideOption::INHERIT];
   [session_controller_ commitPendingItem];
 
-  EXPECT_EQ(session_controller_.get().previousItemIndex, 1);
+  EXPECT_EQ(session_controller_.previousItemIndex, 1);
 
   [session_controller_ goToItemAtIndex:1 discardNonCommittedItems:NO];
-  EXPECT_EQ(session_controller_.get().previousItemIndex, 2);
+  EXPECT_EQ(session_controller_.previousItemIndex, 2);
 
   [session_controller_ goToItemAtIndex:0 discardNonCommittedItems:NO];
-  EXPECT_EQ(session_controller_.get().previousItemIndex, 1);
+  EXPECT_EQ(session_controller_.previousItemIndex, 1);
 
   [session_controller_ goToItemAtIndex:1 discardNonCommittedItems:NO];
-  EXPECT_EQ(session_controller_.get().previousItemIndex, 0);
+  EXPECT_EQ(session_controller_.previousItemIndex, 0);
 
   [session_controller_ goToItemAtIndex:2 discardNonCommittedItems:NO];
-  EXPECT_EQ(session_controller_.get().previousItemIndex, 1);
+  EXPECT_EQ(session_controller_.previousItemIndex, 1);
 }
 
 TEST_F(CRWSessionControllerTest, PushNewItem) {
   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* controller =
       [[CRWSessionController alloc] initWithBrowserState:&browser_state_
                                          navigationItems:std::move(items)
-                                  lastCommittedItemIndex:0]);
+                                  lastCommittedItemIndex:0];
 
   GURL pushPageGurl1("http://www.firstpage.com/#push1");
   NSString* stateObject1 = @"{'foo': 1}";
   [controller pushNewItemWithURL:pushPageGurl1
                      stateObject:stateObject1
                       transition:ui::PAGE_TRANSITION_LINK];
   web::NavigationItemImpl* pushedItem = [controller currentItem];
   NSUInteger expectedCount = 2;
-  EXPECT_EQ(expectedCount, controller.get().items.size());
+  EXPECT_EQ(expectedCount, controller.items.size());
   EXPECT_EQ(pushPageGurl1, pushedItem->GetURL());
   EXPECT_TRUE(pushedItem->IsCreatedFromPushState());
   EXPECT_NSEQ(stateObject1, pushedItem->GetSerializedStateObject());
   EXPECT_EQ(GURL("http://www.firstpage.com/"), pushedItem->GetReferrer().url);
 
   // Add another new item and check size and fields again.
   GURL pushPageGurl2("http://www.firstpage.com/push2");
   [controller pushNewItemWithURL:pushPageGurl2
                      stateObject:nil
                       transition:ui::PAGE_TRANSITION_LINK];
   pushedItem = [controller currentItem];
   expectedCount = 3;
-  EXPECT_EQ(expectedCount, controller.get().items.size());
+  EXPECT_EQ(expectedCount, controller.items.size());
   EXPECT_EQ(pushPageGurl2, pushedItem->GetURL());
   EXPECT_TRUE(pushedItem->IsCreatedFromPushState());
   EXPECT_EQ(nil, pushedItem->GetSerializedStateObject());
   EXPECT_EQ(pushPageGurl1, pushedItem->GetReferrer().url);
 }
 
 TEST_F(CRWSessionControllerTest, IsSameDocumentNavigation) {
   std::vector<std::unique_ptr<web::NavigationItem>> items;
   items.push_back(
       CreateNavigationItem("http://foo.com", "http://google.com", @"First"));
   // Push state navigation.
   items.push_back(
       CreateNavigationItem("http://foo.com#bar", "http://foo.com", @"Second"));
   items.push_back(CreateNavigationItem("http://google.com",
                                        "http://foo.com#bar", @"Third"));
   items.push_back(
       CreateNavigationItem("http://foo.com", "http://google.com", @"Fourth"));
   // 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* controller =
       [[CRWSessionController alloc] initWithBrowserState:&browser_state_
                                          navigationItems:std::move(items)
-                                  lastCommittedItemIndex:0]);
+                                  lastCommittedItemIndex:0];
   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);
 
@@ skipping 14 matching lines @@
 }
 
 TEST_F(CRWSessionControllerTest, UpdateCurrentItem) {
   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* controller =
       [[CRWSessionController alloc] initWithBrowserState:&browser_state_
                                          navigationItems:std::move(items)
-                                  lastCommittedItemIndex:0]);
+                                  lastCommittedItemIndex:0];
 
   GURL replacePageGurl1("http://www.firstpage.com/#replace1");
   NSString* stateObject1 = @"{'foo': 1}";
 
   // Replace current item and check the size of history and fields of the
   // modified item.
   [controller updateCurrentItemWithURL:replacePageGurl1
                            stateObject:stateObject1];
   web::NavigationItemImpl* replacedItem = [controller currentItem];
   NSUInteger expectedCount = 3;
-  EXPECT_EQ(expectedCount, controller.get().items.size());
+  EXPECT_EQ(expectedCount, controller.items.size());
   EXPECT_EQ(replacePageGurl1, replacedItem->GetURL());
   EXPECT_FALSE(replacedItem->IsCreatedFromPushState());
   EXPECT_NSEQ(stateObject1, replacedItem->GetSerializedStateObject());
   EXPECT_EQ(GURL("http://www.starturl.com/"), replacedItem->GetReferrer().url);
 
   // Replace current item and check size and fields again.
   GURL replacePageGurl2("http://www.firstpage.com/#replace2");
-  [controller.get() updateCurrentItemWithURL:replacePageGurl2 stateObject:nil];
+  [controller updateCurrentItemWithURL:replacePageGurl2 stateObject:nil];
   replacedItem = [controller currentItem];
-  EXPECT_EQ(expectedCount, controller.get().items.size());
+  EXPECT_EQ(expectedCount, controller.items.size());
   EXPECT_EQ(replacePageGurl2, replacedItem->GetURL());
   EXPECT_FALSE(replacedItem->IsCreatedFromPushState());
   EXPECT_NSEQ(nil, replacedItem->GetSerializedStateObject());
   EXPECT_EQ(GURL("http://www.starturl.com/"), replacedItem->GetReferrer().url);
 }
 
 TEST_F(CRWSessionControllerTest, TestBackwardForwardItems) {
   [session_controller_
                addPendingItem:GURL("http://www.example.com/0")
                      referrer:MakeReferrer("http://www.example.com/a")
@@ skipping 16 matching lines @@
       userAgentOverrideOption:UserAgentOverrideOption::INHERIT];
   [session_controller_ commitPendingItem];
   [session_controller_
                addPendingItem:GURL("http://www.example.com/2")
                      referrer:MakeReferrer("http://www.example.com/c")
                    transition:ui::PAGE_TRANSITION_LINK
                initiationType:web::NavigationInitiationType::USER_INITIATED
       userAgentOverrideOption:UserAgentOverrideOption::INHERIT];
   [session_controller_ commitPendingItem];
 
-  EXPECT_EQ(3, session_controller_.get().lastCommittedItemIndex);
+  EXPECT_EQ(3, session_controller_.lastCommittedItemIndex);
   web::NavigationItemList back_items = [session_controller_ backwardItems];
   EXPECT_EQ(2U, back_items.size());
   EXPECT_TRUE([session_controller_ forwardItems].empty());
   EXPECT_EQ("http://www.example.com/redirect", back_items[0]->GetURL().spec());
 
   [session_controller_ goToItemAtIndex:1 discardNonCommittedItems:NO];
   EXPECT_EQ(1U, [session_controller_ backwardItems].size());
   EXPECT_EQ(1U, [session_controller_ forwardItems].size());
 
   [session_controller_ goToItemAtIndex:0 discardNonCommittedItems:NO];
@@ skipping 33 matching lines @@
                initiationType:web::NavigationInitiationType::USER_INITIATED
       userAgentOverrideOption:UserAgentOverrideOption::INHERIT];
   [session_controller_ commitPendingItem];
   [session_controller_
                addPendingItem:GURL("http://www.example.com/3")
                      referrer:MakeReferrer("http://www.example.com/d")
                    transition:ui::PAGE_TRANSITION_LINK
                initiationType:web::NavigationInitiationType::USER_INITIATED
       userAgentOverrideOption:UserAgentOverrideOption::INHERIT];
   [session_controller_ addTransientItemWithURL:GURL("http://www.example.com")];
-  EXPECT_EQ(3, session_controller_.get().lastCommittedItemIndex);
-  EXPECT_EQ(2, session_controller_.get().previousItemIndex);
+  EXPECT_EQ(3, session_controller_.lastCommittedItemIndex);
+  EXPECT_EQ(2, session_controller_.previousItemIndex);
   EXPECT_TRUE([session_controller_ pendingItem]);
   EXPECT_TRUE([session_controller_ transientItem]);
 
   // Going back and forth without discaring transient and pending items.
   [session_controller_ goToItemAtIndex:1 discardNonCommittedItems:NO];
-  EXPECT_EQ(1, session_controller_.get().lastCommittedItemIndex);
-  EXPECT_EQ(3, session_controller_.get().previousItemIndex);
-  EXPECT_TRUE(session_controller_.get().pendingItem);
-  EXPECT_TRUE(session_controller_.get().transientItem);
+  EXPECT_EQ(1, session_controller_.lastCommittedItemIndex);
+  EXPECT_EQ(3, session_controller_.previousItemIndex);
+  EXPECT_TRUE(session_controller_.pendingItem);
+  EXPECT_TRUE(session_controller_.transientItem);
   [session_controller_ goToItemAtIndex:3 discardNonCommittedItems:NO];
-  EXPECT_EQ(3, session_controller_.get().lastCommittedItemIndex);
-  EXPECT_EQ(1, session_controller_.get().previousItemIndex);
-  EXPECT_TRUE(session_controller_.get().pendingItem);
-  EXPECT_TRUE(session_controller_.get().transientItem);
+  EXPECT_EQ(3, session_controller_.lastCommittedItemIndex);
+  EXPECT_EQ(1, session_controller_.previousItemIndex);
+  EXPECT_TRUE(session_controller_.pendingItem);
+  EXPECT_TRUE(session_controller_.transientItem);
 
   // Going back should discard transient and pending items.
   [session_controller_ goToItemAtIndex:1 discardNonCommittedItems:YES];
-  EXPECT_EQ(1, session_controller_.get().lastCommittedItemIndex);
-  EXPECT_EQ(3, session_controller_.get().previousItemIndex);
-  EXPECT_FALSE(session_controller_.get().pendingItem);
-  EXPECT_FALSE(session_controller_.get().transientItem);
+  EXPECT_EQ(1, session_controller_.lastCommittedItemIndex);
+  EXPECT_EQ(3, session_controller_.previousItemIndex);
+  EXPECT_FALSE(session_controller_.pendingItem);
+  EXPECT_FALSE(session_controller_.transientItem);
 
   // Going forward should discard transient item.
   [session_controller_ addTransientItemWithURL:GURL("http://www.example.com")];
-  EXPECT_TRUE(session_controller_.get().transientItem);
+  EXPECT_TRUE(session_controller_.transientItem);
   [session_controller_ goToItemAtIndex:2 discardNonCommittedItems:YES];
-  EXPECT_EQ(2, session_controller_.get().lastCommittedItemIndex);
-  EXPECT_EQ(1, session_controller_.get().previousItemIndex);
-  EXPECT_FALSE(session_controller_.get().transientItem);
+  EXPECT_EQ(2, session_controller_.lastCommittedItemIndex);
+  EXPECT_EQ(1, session_controller_.previousItemIndex);
+  EXPECT_FALSE(session_controller_.transientItem);
 
   // Out of bounds navigations should be no-op.
   [session_controller_ goToItemAtIndex:-1 discardNonCommittedItems:NO];
-  EXPECT_EQ(2, session_controller_.get().lastCommittedItemIndex);
-  EXPECT_EQ(1, session_controller_.get().previousItemIndex);
+  EXPECT_EQ(2, session_controller_.lastCommittedItemIndex);
+  EXPECT_EQ(1, session_controller_.previousItemIndex);
   [session_controller_ goToItemAtIndex:NSIntegerMax
               discardNonCommittedItems:NO];
-  EXPECT_EQ(2, session_controller_.get().lastCommittedItemIndex);
-  EXPECT_EQ(1, session_controller_.get().previousItemIndex);
+  EXPECT_EQ(2, session_controller_.lastCommittedItemIndex);
+  EXPECT_EQ(1, session_controller_.previousItemIndex);
 
   // Going to current index should not change the previous index.
   [session_controller_ goToItemAtIndex:2 discardNonCommittedItems:NO];
-  EXPECT_EQ(2, session_controller_.get().lastCommittedItemIndex);
-  EXPECT_EQ(1, session_controller_.get().previousItemIndex);
+  EXPECT_EQ(2, session_controller_.lastCommittedItemIndex);
+  EXPECT_EQ(1, session_controller_.previousItemIndex);
 }
 
 // Tests that visible URL is the same as transient URL if there are no committed
 // 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());
 }
@@ skipping 149 matching lines @@
                initiationType:web::NavigationInitiationType::USER_INITIATED
       userAgentOverrideOption:UserAgentOverrideOption::INHERIT];
   [session_controller_ commitPendingItem];
   [session_controller_
                addPendingItem:GURL("http://www.example.com/2")
                      referrer:MakeReferrer("http://www.example.com/c")
                    transition:ui::PAGE_TRANSITION_LINK
                initiationType:web::NavigationInitiationType::USER_INITIATED
       userAgentOverrideOption:UserAgentOverrideOption::INHERIT];
 
-  EXPECT_EQ(1, session_controller_.get().lastCommittedItemIndex);
+  EXPECT_EQ(1, session_controller_.lastCommittedItemIndex);
   EXPECT_TRUE([session_controller_ pendingItem]);
   EXPECT_EQ(-1, [session_controller_ pendingItemIndex]);
   EXPECT_EQ(GURL("http://www.example.com/2"), [session_controller_ currentURL]);
 
   web::NavigationItemList back_items = [session_controller_ backwardItems];
   ASSERT_EQ(1U, back_items.size());
   EXPECT_EQ("http://www.example.com/0", back_items[0]->GetURL().spec());
 }
 
 // Tests that |-backwardItems| returns all committed items if there is a
 // transient item. This can happen if an intersitial was loaded for SSL error.
 // See crbug.com/691311.
 TEST_F(CRWSessionControllerTest,
        BackwardItemsShouldContainAllCommittedIfCurrentIsTransient) {
   [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
       userAgentOverrideOption:UserAgentOverrideOption::INHERIT];
   [session_controller_ commitPendingItem];
   [session_controller_
       addTransientItemWithURL:GURL("http://www.example.com/1")];
 
-  EXPECT_EQ(0, session_controller_.get().lastCommittedItemIndex);
+  EXPECT_EQ(0, session_controller_.lastCommittedItemIndex);
   EXPECT_TRUE([session_controller_ transientItem]);
   EXPECT_EQ(GURL("http://www.example.com/1"), [session_controller_ currentURL]);
 
   web::NavigationItemList back_items = [session_controller_ backwardItems];
   ASSERT_EQ(1U, back_items.size());
   EXPECT_EQ("http://www.example.com/0", back_items[0]->GetURL().spec());
 }
 
 // Tests that |-backwardItems| works as expected when the transient item is the
 // only item in history.
 TEST_F(CRWSessionControllerTest, BackwardItemsShouldBeEmptyIfFirstIsTransient) {
   [session_controller_
       addTransientItemWithURL:GURL("http://www.example.com/1")];
 
-  EXPECT_EQ(-1, session_controller_.get().lastCommittedItemIndex);
+  EXPECT_EQ(-1, session_controller_.lastCommittedItemIndex);
   EXPECT_TRUE([session_controller_ transientItem]);
   EXPECT_EQ(GURL("http://www.example.com/1"), [session_controller_ currentURL]);
 
   web::NavigationItemList back_items = [session_controller_ backwardItems];
   EXPECT_TRUE(back_items.empty());
 }
 
 }  // anonymous namespace