[iOS] Refactoring web CRWSessionController user agent code.

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/crw_session_entry.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"
 
 @interface CRWSessionController (Testing)
 - (const GURL&)URLForSessionAtIndex:(NSUInteger)index;
@@ skipping 38 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_ addPendingItem:GURL("http://www.example.com")
-                             referrer:web::Referrer()
-                           transition:ui::PAGE_TRANSITION_TYPED
-                    rendererInitiated:NO];
+  [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_ entries] lastObject],
             [session_controller_ pendingEntry]);
 }
 
 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];
+  [session_controller_
+      addPendingItem:GURL("http://www.url.com")
+            referrer:MakeReferrer("http://www.referer.com")
+          transition:ui::PAGE_TRANSITION_TYPED
+      initiationType:web::NavigationInitiationType::USER_INITIATED];
 
   EXPECT_EQ(0U, [[session_controller_ entries] count]);
   EXPECT_EQ(
       GURL("http://www.url.com/"),
       [session_controller_ currentURL]);
 }
 
 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_
+      addPendingItem:GURL("http://www.committed.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.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
+      initiationType:web::NavigationInitiationType::USER_INITIATED];
 
   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, addPendingItemWithExisingPendingEntryIndex) {
-  [session_controller_ addPendingItem:GURL("http://www.example.com")
-                             referrer:web::Referrer()
-                           transition:ui::PAGE_TRANSITION_TYPED
-                    rendererInitiated:NO];
+  [session_controller_
+      addPendingItem:GURL("http://www.example.com")
+            referrer:web::Referrer()
+          transition:ui::PAGE_TRANSITION_TYPED
+      initiationType:web::NavigationInitiationType::USER_INITIATED];
   [session_controller_ commitPendingItem];
-  [session_controller_ addPendingItem:GURL("http://www.example.com/0")
-                             referrer:web::Referrer()
-                           transition:ui::PAGE_TRANSITION_TYPED
-                    rendererInitiated:NO];
+  [session_controller_
+      addPendingItem:GURL("http://www.example.com/0")
+            referrer:web::Referrer()
+          transition:ui::PAGE_TRANSITION_TYPED
+      initiationType:web::NavigationInitiationType::USER_INITIATED];
   [session_controller_ commitPendingItem];
 
   // Set 0 as pending entry index.
   [session_controller_ setPendingItemIndex:0];
   EXPECT_EQ(GURL("http://www.example.com/"),
             [[session_controller_ pendingEntry] navigationItem]->GetURL());
   EXPECT_EQ(0, [session_controller_ pendingItemIndex]);
 
   // Add a pending entry, which should drop pending navigation index.
-  [session_controller_ addPendingItem: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
+      initiationType:web::NavigationInitiationType::USER_INITIATED];
   EXPECT_EQ(GURL("http://www.example.com/1"),
             [[session_controller_ pendingEntry] navigationItem]->GetURL());
   EXPECT_EQ(-1, [session_controller_ pendingItemIndex]);
 }
 
 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_
-         addPendingItem:GURL("http://www.another.url.com")
-               referrer:MakeReferrer("http://www.another.referer.com")
-             transition:ui::PAGE_TRANSITION_TYPED
-      rendererInitiated:NO];
+      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];
 
   EXPECT_EQ(0U, [[session_controller_ entries] count]);
   EXPECT_EQ(
       GURL("http://www.another.url.com/"),
       [session_controller_ currentURL]);
 }
 
 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_
+      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_ 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, addPendingItemOverridingAndCommit) {
-  [session_controller_ addPendingItem:GURL("http://www.url.com")
-                             referrer:MakeReferrer("http://www.referer.com")
-                           transition:ui::PAGE_TRANSITION_TYPED
-                    rendererInitiated:NO];
   [session_controller_
-         addPendingItem:GURL("http://www.another.url.com")
-               referrer:MakeReferrer("http://www.another.referer.com")
-             transition:ui::PAGE_TRANSITION_TYPED
-      rendererInitiated:NO];
+      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_ 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, addPendingItemAndCommitMultiple) {
-  [session_controller_ addPendingItem: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
+      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
-      rendererInitiated:NO];
+      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_ 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, addPendingItemAndDiscard) {
-  [session_controller_ addPendingItem: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
+      initiationType:web::NavigationInitiationType::USER_INITIATED];
   [session_controller_ discardNonCommittedItems];
 
   EXPECT_EQ(0U, [[session_controller_ entries] count]);
   EXPECT_EQ(nil, [session_controller_ currentEntry]);
 }
 
 // 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_
+      addPendingItem:GURL("http://www.example.com")
+            referrer:web::Referrer()
+          transition:ui::PAGE_TRANSITION_TYPED
+      initiationType:web::NavigationInitiationType::USER_INITIATED];
   [session_controller_ commitPendingItem];
 
   [session_controller_ setPendingItemIndex:0];
   EXPECT_TRUE([session_controller_ pendingEntry]);
   EXPECT_EQ(0, [session_controller_ pendingItemIndex]);
 
   [session_controller_ discardNonCommittedItems];
   EXPECT_FALSE([session_controller_ pendingEntry]);
   EXPECT_EQ(-1, [session_controller_ pendingItemIndex]);
 }
 
 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_
+      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];
 
-  [session_controller_ addPendingItem:GURL("http://www.another.url.com")
-                             referrer:MakeReferrer("http://www.referer.com")
-                           transition:ui::PAGE_TRANSITION_TYPED
-                    rendererInitiated:NO];
+  [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_ 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, addPendingItemAndCommitAndAddAndDiscard) {
-  [session_controller_ addPendingItem: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
+      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
-                    rendererInitiated:NO];
+  [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_ 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,
        commitPendingItemWithoutPendingOrCommittedEntry) {
   [session_controller_ commitPendingItem];
 
   EXPECT_EQ(0U, [[session_controller_ entries] count]);
   EXPECT_EQ(nil, [session_controller_ currentEntry]);
 }
 
 TEST_F(CRWSessionControllerTest,
        commitPendingItemWithoutPendingEntryWithCommittedEntry) {
   // Setup committed entry
-  [session_controller_ addPendingItem: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
+      initiationType:web::NavigationInitiationType::USER_INITIATED];
   [session_controller_ commitPendingItem];
 
   // Commit pending entry when there is no such one
   [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, commitPendingItemWithExistingForwardEntries) {
   // Make 3 entries.
-  [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_
+      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
-                    rendererInitiated:YES];
+  [session_controller_
+      addPendingItem:GURL("http://www.example.com/1")
+            referrer:MakeReferrer("http://www.example.com/b")
+          transition:ui::PAGE_TRANSITION_LINK
+      initiationType:web::NavigationInitiationType::RENDERER_INITIATED];
   [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_
+      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];
 
   // Go back to the first entry.
   [session_controller_ goToItemAtIndex:0];
 
   // Create and commit a new pending entry.
-  [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_
+      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.
   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, commitPendingItemIndex) {
-  [session_controller_ addPendingItem:GURL("http://www.example.com/0")
-                             referrer:web::Referrer()
-                           transition:ui::PAGE_TRANSITION_TYPED
-                    rendererInitiated:NO];
+  [session_controller_
+      addPendingItem:GURL("http://www.example.com/0")
+            referrer:web::Referrer()
+          transition:ui::PAGE_TRANSITION_TYPED
+      initiationType:web::NavigationInitiationType::USER_INITIATED];
   [session_controller_ commitPendingItem];
-  [session_controller_ addPendingItem: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
+      initiationType:web::NavigationInitiationType::USER_INITIATED];
   [session_controller_ commitPendingItem];
-  [session_controller_ addPendingItem:GURL("http://www.example.com/2")
-                             referrer:web::Referrer()
-                           transition:ui::PAGE_TRANSITION_TYPED
-                    rendererInitiated:NO];
+  [session_controller_
+      addPendingItem:GURL("http://www.example.com/2")
+            referrer:web::Referrer()
+          transition:ui::PAGE_TRANSITION_TYPED
+      initiationType:web::NavigationInitiationType::USER_INITIATED];
   [session_controller_ commitPendingItem];
   ASSERT_EQ(3U, [[session_controller_ entries] count]);
 
   // Go to the middle, and commit first pending entry index.
   [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);
@@ skipping 15 matching lines @@
        DiscardPendingEntryWithoutPendingOrCommittedEntry) {
   [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_ addPendingItem: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
+      initiationType:web::NavigationInitiationType::USER_INITIATED];
   [session_controller_ commitPendingItem];
 
   // Discard noncommitted entries when there is no such one
   [session_controller_ discardNonCommittedItems];
 
   EXPECT_EQ(1U, [[session_controller_ entries] count]);
   EXPECT_EQ(
       [[session_controller_ entries] objectAtIndex:0U],
       [session_controller_ currentEntry]);
 }
 
 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, updatePendingItemWithPendingEntry) {
-  [session_controller_ addPendingItem: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
+      initiationType:web::NavigationInitiationType::USER_INITIATED];
   [session_controller_ updatePendingItem:GURL("http://www.another.url.com")];
 
   EXPECT_EQ(
       GURL("http://www.another.url.com/"),
       [session_controller_ currentURL]);
 }
 
 TEST_F(CRWSessionControllerTest,
        updatePendingItemWithPendingEntryAlreadyCommited) {
-  [session_controller_ addPendingItem: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
+      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_ 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_ addPendingItem:GURL("http://www.url.com/2")
-                             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
+      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
-                    rendererInitiated:NO];
+  [session_controller_
+      addPendingItem:GURL("http://www.url.com/3")
+            referrer:web::Referrer()
+          transition:ui::PAGE_TRANSITION_TYPED
+      initiationType:web::NavigationInitiationType::USER_INITIATED];
 
   // 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 addPendingItem:GURL("http://www.url.com/0")
-                                  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
+      initiationType:web::NavigationInitiationType::USER_INITIATED];
   [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
+      addPendingItem:GURL("http://www.url.com/1")
+            referrer:web::Referrer()
+          transition:ui::PAGE_TRANSITION_TYPED
+      initiationType:web::NavigationInitiationType::USER_INITIATED];
 
   // 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_ 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_ addPendingItem:GURL("http://www.url.com/0")
-                             referrer:web::Referrer()
-                           transition:ui::PAGE_TRANSITION_TYPED
-                    rendererInitiated:NO];
+  [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
-                    rendererInitiated:NO];
+  [session_controller_
+      addPendingItem:GURL("http://www.url.com/1")
+            referrer:web::Referrer()
+          transition:ui::PAGE_TRANSITION_TYPED
+      initiationType:web::NavigationInitiationType::USER_INITIATED];
   [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"];
@@ skipping 18 matching lines @@
 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 addPendingItem:GURL("http://www.url.com/0")
-                                  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
+      initiationType:web::NavigationInitiationType::USER_INITIATED];
   [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
+      addPendingItem:GURL("http://www.url.com/1")
+            referrer:web::Referrer()
+          transition:ui::PAGE_TRANSITION_TYPED
+      initiationType:web::NavigationInitiationType::USER_INITIATED];
   [other_session_controller commitPendingItem];
-  [other_session_controller addPendingItem: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/2")
+            referrer:web::Referrer()
+          transition:ui::PAGE_TRANSITION_TYPED
+      initiationType:web::NavigationInitiationType::USER_INITIATED];
 
   // 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_ 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_ addPendingItem:GURL("http://www.url.com/2")
-                             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
+      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
-                    rendererInitiated:NO];
+  [session_controller_
+      addPendingItem:GURL("http://www.url.com/3")
+            referrer:web::Referrer()
+          transition:ui::PAGE_TRANSITION_TYPED
+      initiationType:web::NavigationInitiationType::USER_INITIATED];
   [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 addPendingItem:GURL("http://www.url.com/0")
-                                  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
+      initiationType:web::NavigationInitiationType::USER_INITIATED];
   [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]);
@@ skipping 65 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_ addPendingItem: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
+      initiationType:web::NavigationInitiationType::USER_INITIATED];
   [session_controller_ commitPendingItem];
   EXPECT_EQ(session_controller_.get().previousNavigationIndex, -1);
-  [session_controller_ addPendingItem:GURL("http://www.url1.com")
-                             referrer:MakeReferrer("http://www.referer.com")
-                           transition:ui::PAGE_TRANSITION_TYPED
-                    rendererInitiated:NO];
+  [session_controller_
+      addPendingItem:GURL("http://www.url1.com")
+            referrer:MakeReferrer("http://www.referer.com")
+          transition:ui::PAGE_TRANSITION_TYPED
+      initiationType:web::NavigationInitiationType::USER_INITIATED];
   [session_controller_ commitPendingItem];
   EXPECT_EQ(session_controller_.get().previousNavigationIndex, 0);
-  [session_controller_ addPendingItem:GURL("http://www.url2.com")
-                             referrer:MakeReferrer("http://www.referer.com")
-                           transition:ui::PAGE_TRANSITION_TYPED
-                    rendererInitiated:NO];
+  [session_controller_
+      addPendingItem:GURL("http://www.url2.com")
+            referrer:MakeReferrer("http://www.referer.com")
+          transition:ui::PAGE_TRANSITION_TYPED
+      initiationType:web::NavigationInitiationType::USER_INITIATED];
   [session_controller_ commitPendingItem];
 
   EXPECT_EQ(session_controller_.get().previousNavigationIndex, 1);
 
   [session_controller_ goToItemAtIndex:1];
   EXPECT_EQ(session_controller_.get().previousNavigationIndex, 2);
 
   [session_controller_ goToItemAtIndex:0];
   EXPECT_EQ(session_controller_.get().previousNavigationIndex, 1);
 
@@ skipping 137 matching lines @@
   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_ addPendingItem: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
+      initiationType:web::NavigationInitiationType::USER_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
-                    rendererInitiated:NO];
+  [session_controller_
+      addPendingItem:GURL("http://www.example.com/1")
+            referrer:MakeReferrer("http://www.example.com/b")
+          transition:ui::PAGE_TRANSITION_LINK
+      initiationType:web::NavigationInitiationType::USER_INITIATED];
   [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_
+      addPendingItem:GURL("http://www.example.com/redirect")
+            referrer:MakeReferrer("http://www.example.com/r")
+          transition:ui::PAGE_TRANSITION_IS_REDIRECT_MASK
+      initiationType:web::NavigationInitiationType::USER_INITIATED];
   [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_
+      addPendingItem:GURL("http://www.example.com/2")
+            referrer:MakeReferrer("http://www.example.com/c")
+          transition:ui::PAGE_TRANSITION_LINK
+      initiationType:web::NavigationInitiationType::USER_INITIATED];
   [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_ goToItemAtIndex:1];
   EXPECT_EQ(1U, [[session_controller_ backwardEntries] count]);
   EXPECT_EQ(1U, [[session_controller_ forwardEntries] count]);
 
   [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_ addPendingItem: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
+      initiationType:web::NavigationInitiationType::USER_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
-                    rendererInitiated:NO];
+  [session_controller_
+      addPendingItem:GURL("http://www.example.com/1")
+            referrer:MakeReferrer("http://www.example.com/b")
+          transition:ui::PAGE_TRANSITION_LINK
+      initiationType:web::NavigationInitiationType::USER_INITIATED];
   [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_
+      addPendingItem:GURL("http://www.example.com/redirect")
+            referrer:MakeReferrer("http://www.example.com/r")
+          transition:ui::PAGE_TRANSITION_IS_REDIRECT_MASK
+      initiationType:web::NavigationInitiationType::USER_INITIATED];
   [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_
+      addPendingItem:GURL("http://www.example.com/2")
+            referrer:MakeReferrer("http://www.example.com/c")
+          transition:ui::PAGE_TRANSITION_LINK
+      initiationType:web::NavigationInitiationType::USER_INITIATED];
   [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_
+      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_.get().pendingEntry);
   EXPECT_TRUE(session_controller_.get().transientEntry);
 
   // Going back should discard transient and pending entries.
   [session_controller_ goToItemAtIndex:1];
   EXPECT_EQ(1, session_controller_.get().currentNavigationIndex);
   EXPECT_EQ(3, session_controller_.get().previousNavigationIndex);
@@ skipping 28 matching lines @@
   [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_ addPendingItem: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
+      initiationType:web::NavigationInitiationType::USER_INITIATED];
   [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_ addPendingItem: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
+      initiationType:web::NavigationInitiationType::USER_INITIATED];
   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_ addPendingItem:GURL("http://www.example.com")
-                             referrer:MakeReferrer("http://www.example.com/a")
-                           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
+      initiationType:web::NavigationInitiationType::USER_INITIATED];
   [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_
+      addPendingItem:GURL("http://www.example.com/0")
+            referrer:MakeReferrer("http://www.example.com/b")
+          transition:ui::PAGE_TRANSITION_LINK
+      initiationType:web::NavigationInitiationType::USER_INITIATED];
   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_ addPendingItem: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
+      initiationType:web::NavigationInitiationType::RENDERER_INITIATED];
   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_ addPendingItem:GURL("http://www.example.com")
-                             referrer:MakeReferrer("http://www.example.com/a")
-                           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
+      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_LINK
-                    rendererInitiated:YES];
+  [session_controller_
+      addPendingItem:GURL("http://www.example.com/0")
+            referrer:MakeReferrer("http://www.example.com/b")
+          transition:ui::PAGE_TRANSITION_LINK
+      initiationType:web::NavigationInitiationType::RENDERER_INITIATED];
   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_ addPendingItem:GURL("http://www.example.com")
-                             referrer:MakeReferrer("http://www.example.com/a")
-                           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
+      initiationType:web::NavigationInitiationType::USER_INITIATED];
   [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_
+      addPendingItem:GURL("http://www.example.com/0")
+            referrer:MakeReferrer("http://www.example.com/b")
+          transition:ui::PAGE_TRANSITION_LINK
+      initiationType:web::NavigationInitiationType::USER_INITIATED];
   [session_controller_ commitPendingItem];
 
   [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_ addPendingItem:GURL("http://www.example.com")
-                             referrer:MakeReferrer("http://www.example.com/a")
-                           transition:ui::PAGE_TRANSITION_CLIENT_REDIRECT
-                    rendererInitiated:YES];
+  [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
-                    rendererInitiated:YES];
+  [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_ backwardEntries].count);
 }
 
 }  // anonymous namespace