Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(63)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: ios/web/navigation/crw_session_controller_unittest.mm

Issue 2794723002: Create new pending item if UserAgentOverrideOption is not INHERIT. (Closed)
Patch Set: Address comments Created 3 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« ios/web/navigation/crw_session_controller.mm ('K') | « ios/web/navigation/crw_session_controller.mm ('k') | ios/web/navigation/navigation_manager_impl.mm » ('j') | ios/web/navigation/navigation_manager_impl_unittest.mm » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ios/web/navigation/crw_session_controller_unittest.mm
diff --git a/ios/web/navigation/crw_session_controller_unittest.mm b/ios/web/navigation/crw_session_controller_unittest.mm
index 2079ced8796386def730511be7f6977daf8ec3a1..287c9ac01336cc9f9658a2ef1eff455d8466ce65 100644
--- a/ios/web/navigation/crw_session_controller_unittest.mm
+++ b/ios/web/navigation/crw_session_controller_unittest.mm
@@ -66,10 +66,12 @@ void SetUp() override {
// 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
- initiationType:web::NavigationInitiationType::USER_INITIATED];
+ addPendingItem:GURL("http://www.example.com")
+ referrer:web::Referrer()
+ transition:ui::PAGE_TRANSITION_TYPED
+ initiationType:web::NavigationInitiationType::USER_INITIATED
+ userAgentOverrideOption:web::NavigationManager::UserAgentOverrideOption::
Eugene But (OOO till 7-30) 2017/04/06 22:53:17 Do you want to use "using web::NavigationManager::
liaoyuke 2017/04/07 15:49:08 Done.
+ INHERIT];
[session_controller_ commitPendingItem];
EXPECT_EQ(-1, [session_controller_ pendingItemIndex]);
@@ -81,10 +83,12 @@ void SetUp() override {
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];
+ addPendingItem:GURL("http://www.url.com")
+ referrer:MakeReferrer("http://www.referer.com")
+ transition:ui::PAGE_TRANSITION_TYPED
+ initiationType:web::NavigationInitiationType::USER_INITIATED
+ userAgentOverrideOption:web::NavigationManager::UserAgentOverrideOption::
+ INHERIT];
EXPECT_TRUE([session_controller_ items].empty());
EXPECT_EQ(
@@ -94,17 +98,21 @@ void SetUp() override {
TEST_F(CRWSessionControllerTest, addPendingItemWithCommittedItems) {
[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];
+ addPendingItem:GURL("http://www.committed.url.com")
+ referrer:MakeReferrer("http://www.referer.com")
+ transition:ui::PAGE_TRANSITION_TYPED
+ initiationType:web::NavigationInitiationType::USER_INITIATED
+ userAgentOverrideOption:web::NavigationManager::UserAgentOverrideOption::
+ INHERIT];
[session_controller_ commitPendingItem];
[session_controller_
- addPendingItem:GURL("http://www.url.com")
- referrer:MakeReferrer("http://www.referer.com")
- transition:ui::PAGE_TRANSITION_TYPED
- initiationType:web::NavigationInitiationType::USER_INITIATED];
+ addPendingItem:GURL("http://www.url.com")
+ referrer:MakeReferrer("http://www.referer.com")
+ transition:ui::PAGE_TRANSITION_TYPED
+ initiationType:web::NavigationInitiationType::USER_INITIATED
+ userAgentOverrideOption:web::NavigationManager::UserAgentOverrideOption::
+ INHERIT];
EXPECT_EQ(1U, [session_controller_ items].size());
EXPECT_EQ(GURL("http://www.committed.url.com/"),
@@ -117,16 +125,20 @@ void SetUp() override {
// Tests that adding a pending item resets pending item index.
TEST_F(CRWSessionControllerTest, addPendingItemWithExistingPendingItemIndex) {
[session_controller_
- addPendingItem:GURL("http://www.example.com")
- referrer:web::Referrer()
- transition:ui::PAGE_TRANSITION_TYPED
- initiationType:web::NavigationInitiationType::USER_INITIATED];
+ addPendingItem:GURL("http://www.example.com")
+ referrer:web::Referrer()
+ transition:ui::PAGE_TRANSITION_TYPED
+ initiationType:web::NavigationInitiationType::USER_INITIATED
+ userAgentOverrideOption:web::NavigationManager::UserAgentOverrideOption::
+ INHERIT];
[session_controller_ commitPendingItem];
[session_controller_
- addPendingItem:GURL("http://www.example.com/0")
- referrer:web::Referrer()
- transition:ui::PAGE_TRANSITION_TYPED
- initiationType:web::NavigationInitiationType::USER_INITIATED];
+ addPendingItem:GURL("http://www.example.com/0")
+ referrer:web::Referrer()
+ transition:ui::PAGE_TRANSITION_TYPED
+ initiationType:web::NavigationInitiationType::USER_INITIATED
+ userAgentOverrideOption:web::NavigationManager::UserAgentOverrideOption::
+ INHERIT];
[session_controller_ commitPendingItem];
// Set 0 as pending item index.
@@ -137,10 +149,12 @@ void SetUp() override {
// Add a pending item, which should drop pending navigation index.
[session_controller_
- addPendingItem:GURL("http://www.example.com/1")
- referrer:web::Referrer()
- transition:ui::PAGE_TRANSITION_TYPED
- initiationType:web::NavigationInitiationType::USER_INITIATED];
+ addPendingItem:GURL("http://www.example.com/1")
+ referrer:web::Referrer()
+ transition:ui::PAGE_TRANSITION_TYPED
+ initiationType:web::NavigationInitiationType::USER_INITIATED
+ userAgentOverrideOption:web::NavigationManager::UserAgentOverrideOption::
+ INHERIT];
EXPECT_EQ(GURL("http://www.example.com/1"),
[session_controller_ pendingItem]->GetURL());
EXPECT_EQ(-1, [session_controller_ pendingItemIndex]);
@@ -148,15 +162,19 @@ void SetUp() override {
TEST_F(CRWSessionControllerTest, addPendingItemOverriding) {
[session_controller_
- addPendingItem:GURL("http://www.url.com")
- referrer:MakeReferrer("http://www.referer.com")
- transition:ui::PAGE_TRANSITION_TYPED
- initiationType:web::NavigationInitiationType::USER_INITIATED];
+ addPendingItem:GURL("http://www.url.com")
+ referrer:MakeReferrer("http://www.referer.com")
+ transition:ui::PAGE_TRANSITION_TYPED
+ initiationType:web::NavigationInitiationType::USER_INITIATED
+ userAgentOverrideOption:web::NavigationManager::UserAgentOverrideOption::
+ INHERIT];
[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];
+ addPendingItem:GURL("http://www.another.url.com")
+ referrer:MakeReferrer("http://www.another.referer.com")
+ transition:ui::PAGE_TRANSITION_TYPED
+ initiationType:web::NavigationInitiationType::USER_INITIATED
+ userAgentOverrideOption:web::NavigationManager::UserAgentOverrideOption::
+ INHERIT];
EXPECT_TRUE([session_controller_ items].empty());
EXPECT_EQ(
@@ -166,10 +184,12 @@ void SetUp() override {
TEST_F(CRWSessionControllerTest, addPendingItemAndCommit) {
[session_controller_
- addPendingItem:GURL("http://www.url.com")
- referrer:MakeReferrer("http://www.referer.com")
- transition:ui::PAGE_TRANSITION_TYPED
- initiationType:web::NavigationInitiationType::USER_INITIATED];
+ addPendingItem:GURL("http://www.url.com")
+ referrer:MakeReferrer("http://www.referer.com")
+ transition:ui::PAGE_TRANSITION_TYPED
+ initiationType:web::NavigationInitiationType::USER_INITIATED
+ userAgentOverrideOption:web::NavigationManager::UserAgentOverrideOption::
+ INHERIT];
[session_controller_ commitPendingItem];
EXPECT_EQ(1U, [session_controller_ items].size());
@@ -181,15 +201,19 @@ void SetUp() override {
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];
+ addPendingItem:GURL("http://www.url.com")
+ referrer:MakeReferrer("http://www.referer.com")
+ transition:ui::PAGE_TRANSITION_TYPED
+ initiationType:web::NavigationInitiationType::USER_INITIATED
+ userAgentOverrideOption:web::NavigationManager::UserAgentOverrideOption::
+ INHERIT];
+ [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
+ userAgentOverrideOption:web::NavigationManager::UserAgentOverrideOption::
+ INHERIT];
[session_controller_ commitPendingItem];
EXPECT_EQ(1U, [session_controller_ items].size());
@@ -201,17 +225,21 @@ void SetUp() override {
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];
+ addPendingItem:GURL("http://www.url.com")
+ referrer:MakeReferrer("http://www.referer.com")
+ transition:ui::PAGE_TRANSITION_TYPED
+ initiationType:web::NavigationInitiationType::USER_INITIATED
+ userAgentOverrideOption:web::NavigationManager::UserAgentOverrideOption::
+ INHERIT];
[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];
+ addPendingItem:GURL("http://www.another.url.com")
+ referrer:MakeReferrer("http://www.another.referer.com")
+ transition:ui::PAGE_TRANSITION_TYPED
+ initiationType:web::NavigationInitiationType::USER_INITIATED
+ userAgentOverrideOption:web::NavigationManager::UserAgentOverrideOption::
+ INHERIT];
[session_controller_ commitPendingItem];
EXPECT_EQ(2U, [session_controller_ items].size());
@@ -225,10 +253,12 @@ void SetUp() override {
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];
+ addPendingItem:GURL("http://www.url.com")
+ referrer:MakeReferrer("http://www.referer.com")
+ transition:ui::PAGE_TRANSITION_TYPED
+ initiationType:web::NavigationInitiationType::USER_INITIATED
+ userAgentOverrideOption:web::NavigationManager::UserAgentOverrideOption::
+ INHERIT];
[session_controller_ discardNonCommittedItems];
EXPECT_TRUE([session_controller_ items].empty());
@@ -238,10 +268,12 @@ void SetUp() override {
// Tests discarding pending item added via |setPendingItemIndex:| call.
TEST_F(CRWSessionControllerTest, setPendingItemIndexAndDiscard) {
[session_controller_
- addPendingItem:GURL("http://www.example.com")
- referrer:web::Referrer()
- transition:ui::PAGE_TRANSITION_TYPED
- initiationType:web::NavigationInitiationType::USER_INITIATED];
+ addPendingItem:GURL("http://www.example.com")
+ referrer:web::Referrer()
+ transition:ui::PAGE_TRANSITION_TYPED
+ initiationType:web::NavigationInitiationType::USER_INITIATED
+ userAgentOverrideOption:web::NavigationManager::UserAgentOverrideOption::
+ INHERIT];
[session_controller_ commitPendingItem];
[session_controller_ setPendingItemIndex:0];
@@ -255,17 +287,21 @@ void SetUp() override {
TEST_F(CRWSessionControllerTest, addPendingItemAndDiscardAndAddAndCommit) {
[session_controller_
- addPendingItem:GURL("http://www.url.com")
- referrer:MakeReferrer("http://www.referer.com")
- transition:ui::PAGE_TRANSITION_TYPED
- initiationType:web::NavigationInitiationType::USER_INITIATED];
+ addPendingItem:GURL("http://www.url.com")
+ referrer:MakeReferrer("http://www.referer.com")
+ transition:ui::PAGE_TRANSITION_TYPED
+ initiationType:web::NavigationInitiationType::USER_INITIATED
+ userAgentOverrideOption:web::NavigationManager::UserAgentOverrideOption::
+ INHERIT];
[session_controller_ discardNonCommittedItems];
[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];
+ addPendingItem:GURL("http://www.another.url.com")
+ referrer:MakeReferrer("http://www.referer.com")
+ transition:ui::PAGE_TRANSITION_TYPED
+ initiationType:web::NavigationInitiationType::USER_INITIATED
+ userAgentOverrideOption:web::NavigationManager::UserAgentOverrideOption::
+ INHERIT];
[session_controller_ commitPendingItem];
EXPECT_EQ(1U, [session_controller_ items].size());
@@ -277,17 +313,21 @@ void SetUp() override {
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];
+ addPendingItem:GURL("http://www.url.com")
+ referrer:MakeReferrer("http://www.referer.com")
+ transition:ui::PAGE_TRANSITION_TYPED
+ initiationType:web::NavigationInitiationType::USER_INITIATED
+ userAgentOverrideOption:web::NavigationManager::UserAgentOverrideOption::
+ INHERIT];
[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];
+ addPendingItem:GURL("http://www.another.url.com")
+ referrer:MakeReferrer("http://www.referer.com")
+ transition:ui::PAGE_TRANSITION_TYPED
+ initiationType:web::NavigationInitiationType::USER_INITIATED
+ userAgentOverrideOption:web::NavigationManager::UserAgentOverrideOption::
+ INHERIT];
[session_controller_ discardNonCommittedItems];
EXPECT_EQ(1U, [session_controller_ items].size());
@@ -309,10 +349,12 @@ void SetUp() override {
commitPendingItemWithoutPendingItemWithCommittedItem) {
// Setup committed item.
[session_controller_
- addPendingItem:GURL("http://www.url.com/")
- referrer:MakeReferrer("http://www.referrer.com/")
- transition:ui::PAGE_TRANSITION_TYPED
- initiationType:web::NavigationInitiationType::USER_INITIATED];
+ addPendingItem:GURL("http://www.url.com/")
+ referrer:MakeReferrer("http://www.referrer.com/")
+ transition:ui::PAGE_TRANSITION_TYPED
+ initiationType:web::NavigationInitiationType::USER_INITIATED
+ userAgentOverrideOption:web::NavigationManager::UserAgentOverrideOption::
+ INHERIT];
[session_controller_ commitPendingItem];
// Commit pending item when there is no such one
@@ -327,22 +369,28 @@ void SetUp() override {
TEST_F(CRWSessionControllerTest, commitPendingItemWithExistingForwardItems) {
// 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];
+ addPendingItem:GURL("http://www.example.com/0")
+ referrer:MakeReferrer("http://www.example.com/a")
+ transition:ui::PAGE_TRANSITION_LINK
+ initiationType:web::NavigationInitiationType::RENDERER_INITIATED
+ userAgentOverrideOption:web::NavigationManager::UserAgentOverrideOption::
+ INHERIT];
[session_controller_ commitPendingItem];
[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];
+ addPendingItem:GURL("http://www.example.com/1")
+ referrer:MakeReferrer("http://www.example.com/b")
+ transition:ui::PAGE_TRANSITION_LINK
+ initiationType:web::NavigationInitiationType::RENDERER_INITIATED
+ userAgentOverrideOption:web::NavigationManager::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::RENDERER_INITIATED];
+ addPendingItem:GURL("http://www.example.com/2")
+ referrer:MakeReferrer("http://www.example.com/c")
+ transition:ui::PAGE_TRANSITION_LINK
+ initiationType:web::NavigationInitiationType::RENDERER_INITIATED
+ userAgentOverrideOption:web::NavigationManager::UserAgentOverrideOption::
+ INHERIT];
[session_controller_ commitPendingItem];
// Go back to the first item.
@@ -350,10 +398,12 @@ void SetUp() override {
// 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];
+ addPendingItem:GURL("http://www.example.com/2")
+ referrer:MakeReferrer("http://www.example.com/c")
+ transition:ui::PAGE_TRANSITION_LINK
+ initiationType:web::NavigationInitiationType::RENDERER_INITIATED
+ userAgentOverrideOption:web::NavigationManager::UserAgentOverrideOption::
+ INHERIT];
[session_controller_ commitPendingItem];
// All forward items should go away.
@@ -366,22 +416,28 @@ void SetUp() override {
// Tests committing pending item 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
- initiationType:web::NavigationInitiationType::USER_INITIATED];
+ addPendingItem:GURL("http://www.example.com/0")
+ referrer:web::Referrer()
+ transition:ui::PAGE_TRANSITION_TYPED
+ initiationType:web::NavigationInitiationType::USER_INITIATED
+ userAgentOverrideOption:web::NavigationManager::UserAgentOverrideOption::
+ INHERIT];
[session_controller_ commitPendingItem];
[session_controller_
- addPendingItem:GURL("http://www.example.com/1")
- referrer:web::Referrer()
- transition:ui::PAGE_TRANSITION_TYPED
- initiationType:web::NavigationInitiationType::USER_INITIATED];
+ addPendingItem:GURL("http://www.example.com/1")
+ referrer:web::Referrer()
+ transition:ui::PAGE_TRANSITION_TYPED
+ initiationType:web::NavigationInitiationType::USER_INITIATED
+ userAgentOverrideOption:web::NavigationManager::UserAgentOverrideOption::
+ INHERIT];
[session_controller_ commitPendingItem];
[session_controller_
- addPendingItem:GURL("http://www.example.com/2")
- referrer:web::Referrer()
- transition:ui::PAGE_TRANSITION_TYPED
- initiationType:web::NavigationInitiationType::USER_INITIATED];
+ addPendingItem:GURL("http://www.example.com/2")
+ referrer:web::Referrer()
+ transition:ui::PAGE_TRANSITION_TYPED
+ initiationType:web::NavigationInitiationType::USER_INITIATED
+ userAgentOverrideOption:web::NavigationManager::UserAgentOverrideOption::
+ INHERIT];
[session_controller_ commitPendingItem];
ASSERT_EQ(3U, [session_controller_ items].size());
@@ -417,10 +473,12 @@ void SetUp() override {
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];
+ addPendingItem:GURL("http://www.url.com")
+ referrer:MakeReferrer("http://www.referer.com")
+ transition:ui::PAGE_TRANSITION_TYPED
+ initiationType:web::NavigationInitiationType::USER_INITIATED
+ userAgentOverrideOption:web::NavigationManager::UserAgentOverrideOption::
+ INHERIT];
[session_controller_ commitPendingItem];
// Discard noncommitted items when there is no such one
@@ -441,10 +499,12 @@ void SetUp() override {
TEST_F(CRWSessionControllerTest, updatePendingItemWithPendingItem) {
[session_controller_
- addPendingItem:GURL("http://www.url.com")
- referrer:MakeReferrer("http://www.referer.com")
- transition:ui::PAGE_TRANSITION_TYPED
- initiationType:web::NavigationInitiationType::USER_INITIATED];
+ addPendingItem:GURL("http://www.url.com")
+ referrer:MakeReferrer("http://www.referer.com")
+ transition:ui::PAGE_TRANSITION_TYPED
+ initiationType:web::NavigationInitiationType::USER_INITIATED
+ userAgentOverrideOption:web::NavigationManager::UserAgentOverrideOption::
+ INHERIT];
[session_controller_ updatePendingItem:GURL("http://www.another.url.com")];
EXPECT_EQ(
@@ -455,10 +515,12 @@ void SetUp() override {
TEST_F(CRWSessionControllerTest,
updatePendingItemWithPendingItemAlreadyCommited) {
[session_controller_
- addPendingItem:GURL("http://www.url.com")
- referrer:MakeReferrer("http://www.referer.com")
- transition:ui::PAGE_TRANSITION_TYPED
- initiationType:web::NavigationInitiationType::USER_INITIATED];
+ addPendingItem:GURL("http://www.url.com")
+ referrer:MakeReferrer("http://www.referer.com")
+ transition:ui::PAGE_TRANSITION_TYPED
+ initiationType:web::NavigationInitiationType::USER_INITIATED
+ userAgentOverrideOption:web::NavigationManager::UserAgentOverrideOption::
+ INHERIT];
[session_controller_ commitPendingItem];
[session_controller_ updatePendingItem:GURL("http://www.another.url.com")];
[session_controller_ commitPendingItem];
@@ -474,31 +536,39 @@ void SetUp() override {
TEST_F(CRWSessionControllerTest, CopyState) {
// 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
- initiationType:web::NavigationInitiationType::USER_INITIATED];
+ addPendingItem:GURL("http://www.url.com/2")
+ referrer:web::Referrer()
+ transition:ui::PAGE_TRANSITION_TYPED
+ initiationType:web::NavigationInitiationType::USER_INITIATED
+ userAgentOverrideOption:web::NavigationManager::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];
+ addPendingItem:GURL("http://www.url.com/3")
+ referrer:web::Referrer()
+ transition:ui::PAGE_TRANSITION_TYPED
+ initiationType:web::NavigationInitiationType::USER_INITIATED
+ userAgentOverrideOption:web::NavigationManager::UserAgentOverrideOption::
+ INHERIT];
// Create source session controller with 1 committed item.
base::scoped_nsobject<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];
+ addPendingItem:GURL("http://www.url.com/0")
+ referrer:web::Referrer()
+ transition:ui::PAGE_TRANSITION_TYPED
+ initiationType:web::NavigationInitiationType::USER_INITIATED
+ userAgentOverrideOption:web::NavigationManager::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];
+ addPendingItem:GURL("http://www.url.com/1")
+ referrer:web::Referrer()
+ transition:ui::PAGE_TRANSITION_TYPED
+ initiationType:web::NavigationInitiationType::USER_INITIATED
+ userAgentOverrideOption:web::NavigationManager::UserAgentOverrideOption::
+ INHERIT];
// Insert and verify the state of target session controller.
EXPECT_TRUE([session_controller_ canPruneAllButLastCommittedItem]);
@@ -522,16 +592,20 @@ void SetUp() override {
TEST_F(CRWSessionControllerTest, CopyStateFromEmptySessionController) {
// 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];
+ addPendingItem:GURL("http://www.url.com/0")
+ referrer:web::Referrer()
+ transition:ui::PAGE_TRANSITION_TYPED
+ initiationType:web::NavigationInitiationType::USER_INITIATED
+ userAgentOverrideOption:web::NavigationManager::UserAgentOverrideOption::
+ INHERIT];
[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];
+ addPendingItem:GURL("http://www.url.com/1")
+ referrer:web::Referrer()
+ transition:ui::PAGE_TRANSITION_TYPED
+ initiationType:web::NavigationInitiationType::USER_INITIATED
+ userAgentOverrideOption:web::NavigationManager::UserAgentOverrideOption::
+ INHERIT];
[session_controller_ commitPendingItem];
// Create empty source session controller.
@@ -562,16 +636,20 @@ void SetUp() override {
base::scoped_nsobject<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];
+ addPendingItem:GURL("http://www.url.com/0")
+ referrer:web::Referrer()
+ transition:ui::PAGE_TRANSITION_TYPED
+ initiationType:web::NavigationInitiationType::USER_INITIATED
+ userAgentOverrideOption:web::NavigationManager::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];
+ addPendingItem:GURL("http://www.url.com/1")
+ referrer:web::Referrer()
+ transition:ui::PAGE_TRANSITION_TYPED
+ initiationType:web::NavigationInitiationType::USER_INITIATED
+ userAgentOverrideOption:web::NavigationManager::UserAgentOverrideOption::
+ INHERIT];
// Attempt to copy |other_session_controller|'s state and verify that
// |session_controller_| is unchanged.
@@ -590,32 +668,40 @@ void SetUp() override {
TEST_F(CRWSessionControllerTest, CopyStateDuringPendingHistoryNavigation) {
// Add 1 committed and 1 pending item to target controller.
[session_controller_
- addPendingItem:GURL("http://www.url.com/1")
- referrer:web::Referrer()
- transition:ui::PAGE_TRANSITION_TYPED
- initiationType:web::NavigationInitiationType::USER_INITIATED];
+ addPendingItem:GURL("http://www.url.com/1")
+ referrer:web::Referrer()
+ transition:ui::PAGE_TRANSITION_TYPED
+ initiationType:web::NavigationInitiationType::USER_INITIATED
+ userAgentOverrideOption:web::NavigationManager::UserAgentOverrideOption::
+ INHERIT];
[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];
+ addPendingItem:GURL("http://www.url.com/2")
+ referrer:web::Referrer()
+ transition:ui::PAGE_TRANSITION_TYPED
+ initiationType:web::NavigationInitiationType::USER_INITIATED
+ userAgentOverrideOption:web::NavigationManager::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_]);
[other_session_controller
- addPendingItem:GURL("http://www.url.com/0")
- referrer:web::Referrer()
- transition:ui::PAGE_TRANSITION_TYPED
- initiationType:web::NavigationInitiationType::USER_INITIATED];
+ addPendingItem:GURL("http://www.url.com/0")
+ referrer:web::Referrer()
+ transition:ui::PAGE_TRANSITION_TYPED
+ initiationType:web::NavigationInitiationType::USER_INITIATED
+ userAgentOverrideOption:web::NavigationManager::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];
+ addPendingItem:GURL("http://www.url.com/1")
+ referrer:web::Referrer()
+ transition:ui::PAGE_TRANSITION_TYPED
+ initiationType:web::NavigationInitiationType::USER_INITIATED
+ userAgentOverrideOption:web::NavigationManager::UserAgentOverrideOption::
+ INHERIT];
// Set the pending item index to the first item.
[session_controller_ setPendingItemIndex:0];
@@ -639,33 +725,41 @@ void SetUp() override {
TEST_F(CRWSessionControllerTest, CopyStateWithTransientItem) {
// Add 1 committed and 1 pending item to target controller.
[session_controller_
- addPendingItem:GURL("http://www.url.com/1")
- referrer:web::Referrer()
- transition:ui::PAGE_TRANSITION_TYPED
- initiationType:web::NavigationInitiationType::USER_INITIATED];
+ addPendingItem:GURL("http://www.url.com/1")
+ referrer:web::Referrer()
+ transition:ui::PAGE_TRANSITION_TYPED
+ initiationType:web::NavigationInitiationType::USER_INITIATED
+ userAgentOverrideOption:web::NavigationManager::UserAgentOverrideOption::
+ INHERIT];
[session_controller_ commitPendingItem];
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];
+ addPendingItem:second_url
+ referrer:web::Referrer()
+ transition:ui::PAGE_TRANSITION_TYPED
+ initiationType:web::NavigationInitiationType::USER_INITIATED
+ userAgentOverrideOption:web::NavigationManager::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_]);
[other_session_controller
- addPendingItem:GURL("http://www.url.com/0")
- referrer:web::Referrer()
- transition:ui::PAGE_TRANSITION_TYPED
- initiationType:web::NavigationInitiationType::USER_INITIATED];
+ addPendingItem:GURL("http://www.url.com/0")
+ referrer:web::Referrer()
+ transition:ui::PAGE_TRANSITION_TYPED
+ initiationType:web::NavigationInitiationType::USER_INITIATED
+ userAgentOverrideOption:web::NavigationManager::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];
+ addPendingItem:GURL("http://www.url.com/1")
+ referrer:web::Referrer()
+ transition:ui::PAGE_TRANSITION_TYPED
+ initiationType:web::NavigationInitiationType::USER_INITIATED
+ userAgentOverrideOption:web::NavigationManager::UserAgentOverrideOption::
+ INHERIT];
// Attempt to copy |other_session_controller|'s state and verify that
// |session_controller_| is unchanged.
@@ -750,24 +844,30 @@ void SetUp() override {
TEST_F(CRWSessionControllerTest, PreviousNavigationItem) {
EXPECT_EQ(session_controller_.get().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];
+ addPendingItem:GURL("http://www.url.com")
+ referrer:MakeReferrer("http://www.referer.com")
+ transition:ui::PAGE_TRANSITION_TYPED
+ initiationType:web::NavigationInitiationType::USER_INITIATED
+ userAgentOverrideOption:web::NavigationManager::UserAgentOverrideOption::
+ INHERIT];
[session_controller_ commitPendingItem];
EXPECT_EQ(session_controller_.get().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];
+ addPendingItem:GURL("http://www.url1.com")
+ referrer:MakeReferrer("http://www.referer.com")
+ transition:ui::PAGE_TRANSITION_TYPED
+ initiationType:web::NavigationInitiationType::USER_INITIATED
+ userAgentOverrideOption:web::NavigationManager::UserAgentOverrideOption::
+ INHERIT];
[session_controller_ commitPendingItem];
EXPECT_EQ(session_controller_.get().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];
+ addPendingItem:GURL("http://www.url2.com")
+ referrer:MakeReferrer("http://www.referer.com")
+ transition:ui::PAGE_TRANSITION_TYPED
+ initiationType:web::NavigationInitiationType::USER_INITIATED
+ userAgentOverrideOption:web::NavigationManager::UserAgentOverrideOption::
+ INHERIT];
[session_controller_ commitPendingItem];
EXPECT_EQ(session_controller_.get().previousItemIndex, 1);
@@ -913,28 +1013,36 @@ void SetUp() override {
TEST_F(CRWSessionControllerTest, TestBackwardForwardItems) {
[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];
+ 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:web::NavigationManager::UserAgentOverrideOption::
+ INHERIT];
[session_controller_ commitPendingItem];
[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];
+ addPendingItem:GURL("http://www.example.com/1")
+ referrer:MakeReferrer("http://www.example.com/b")
+ transition:ui::PAGE_TRANSITION_LINK
+ initiationType:web::NavigationInitiationType::USER_INITIATED
+ userAgentOverrideOption:web::NavigationManager::UserAgentOverrideOption::
+ INHERIT];
[session_controller_ commitPendingItem];
[session_controller_
- addPendingItem:GURL("http://www.example.com/redirect")
- referrer:MakeReferrer("http://www.example.com/r")
- transition:ui::PAGE_TRANSITION_CLIENT_REDIRECT
- initiationType:web::NavigationInitiationType::USER_INITIATED];
+ addPendingItem:GURL("http://www.example.com/redirect")
+ referrer:MakeReferrer("http://www.example.com/r")
+ transition:ui::PAGE_TRANSITION_CLIENT_REDIRECT
+ initiationType:web::NavigationInitiationType::USER_INITIATED
+ userAgentOverrideOption:web::NavigationManager::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];
+ 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:web::NavigationManager::UserAgentOverrideOption::
+ INHERIT];
[session_controller_ commitPendingItem];
EXPECT_EQ(3, session_controller_.get().lastCommittedItemIndex);
@@ -957,34 +1065,44 @@ void SetUp() override {
// 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];
+ 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:web::NavigationManager::UserAgentOverrideOption::
+ INHERIT];
[session_controller_ commitPendingItem];
[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];
+ addPendingItem:GURL("http://www.example.com/1")
+ referrer:MakeReferrer("http://www.example.com/b")
+ transition:ui::PAGE_TRANSITION_LINK
+ initiationType:web::NavigationInitiationType::USER_INITIATED
+ userAgentOverrideOption:web::NavigationManager::UserAgentOverrideOption::
+ INHERIT];
[session_controller_ commitPendingItem];
[session_controller_
- addPendingItem:GURL("http://www.example.com/redirect")
- referrer:MakeReferrer("http://www.example.com/r")
- transition:ui::PAGE_TRANSITION_CLIENT_REDIRECT
- initiationType:web::NavigationInitiationType::USER_INITIATED];
+ addPendingItem:GURL("http://www.example.com/redirect")
+ referrer:MakeReferrer("http://www.example.com/r")
+ transition:ui::PAGE_TRANSITION_CLIENT_REDIRECT
+ initiationType:web::NavigationInitiationType::USER_INITIATED
+ userAgentOverrideOption:web::NavigationManager::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];
+ 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:web::NavigationManager::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];
+ 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:web::NavigationManager::UserAgentOverrideOption::
+ INHERIT];
[session_controller_ addTransientItemWithURL:GURL("http://www.example.com")];
EXPECT_EQ(3, session_controller_.get().lastCommittedItemIndex);
EXPECT_EQ(2, session_controller_.get().previousItemIndex);
@@ -1033,10 +1151,12 @@ void SetUp() override {
// item.
TEST_F(CRWSessionControllerTest, VisibleItemWithCommittedAndTransientItems) {
[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];
+ 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:web::NavigationManager::UserAgentOverrideOption::
+ INHERIT];
[session_controller_ commitPendingItem];
[session_controller_ addTransientItemWithURL:GURL("http://www.example.com")];
web::NavigationItem* visible_item = [session_controller_ visibleItem];
@@ -1048,10 +1168,12 @@ void SetUp() override {
TEST_F(CRWSessionControllerTest,
VisibleItemWithSingleUserInitiatedPendingItem) {
[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];
+ 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:web::NavigationManager::UserAgentOverrideOption::
+ INHERIT];
web::NavigationItem* visible_item = [session_controller_ visibleItem];
ASSERT_TRUE(visible_item);
EXPECT_EQ("http://www.example.com/0", visible_item->GetURL().spec());
@@ -1062,16 +1184,20 @@ void SetUp() override {
TEST_F(CRWSessionControllerTest,
VisibleItemWithCommittedAndUserInitiatedPendingItem) {
[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];
+ addPendingItem:GURL("http://www.example.com")
+ referrer:MakeReferrer("http://www.example.com/a")
+ transition:ui::PAGE_TRANSITION_LINK
+ initiationType:web::NavigationInitiationType::USER_INITIATED
+ userAgentOverrideOption:web::NavigationManager::UserAgentOverrideOption::
+ INHERIT];
[session_controller_ commitPendingItem];
[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];
+ addPendingItem:GURL("http://www.example.com/0")
+ referrer:MakeReferrer("http://www.example.com/b")
+ transition:ui::PAGE_TRANSITION_LINK
+ initiationType:web::NavigationInitiationType::USER_INITIATED
+ userAgentOverrideOption:web::NavigationManager::UserAgentOverrideOption::
+ INHERIT];
web::NavigationItem* visible_item = [session_controller_ visibleItem];
ASSERT_TRUE(visible_item);
EXPECT_EQ("http://www.example.com/0", visible_item->GetURL().spec());
@@ -1082,10 +1208,12 @@ void SetUp() override {
TEST_F(CRWSessionControllerTest,
VisibleItemWithSingleRendererInitiatedPendingItem) {
[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];
+ addPendingItem:GURL("http://www.example.com/0")
+ referrer:MakeReferrer("http://www.example.com/a")
+ transition:ui::PAGE_TRANSITION_LINK
+ initiationType:web::NavigationInitiationType::RENDERER_INITIATED
+ userAgentOverrideOption:web::NavigationManager::UserAgentOverrideOption::
+ INHERIT];
web::NavigationItem* visible_item = [session_controller_ visibleItem];
ASSERT_FALSE(visible_item);
}
@@ -1095,16 +1223,20 @@ void SetUp() override {
TEST_F(CRWSessionControllerTest,
VisibleItemWithCommittedAndRendererInitiatedPendingItem) {
[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];
+ addPendingItem:GURL("http://www.example.com")
+ referrer:MakeReferrer("http://www.example.com/a")
+ transition:ui::PAGE_TRANSITION_LINK
+ initiationType:web::NavigationInitiationType::RENDERER_INITIATED
+ userAgentOverrideOption:web::NavigationManager::UserAgentOverrideOption::
+ INHERIT];
[session_controller_ commitPendingItem];
[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];
+ addPendingItem:GURL("http://www.example.com/0")
+ referrer:MakeReferrer("http://www.example.com/b")
+ transition:ui::PAGE_TRANSITION_LINK
+ initiationType:web::NavigationInitiationType::RENDERER_INITIATED
+ userAgentOverrideOption:web::NavigationManager::UserAgentOverrideOption::
+ INHERIT];
web::NavigationItem* visible_item = [session_controller_ visibleItem];
ASSERT_TRUE(visible_item);
EXPECT_EQ("http://www.example.com/", visible_item->GetURL().spec());
@@ -1114,16 +1246,20 @@ void SetUp() override {
// navigation index.
TEST_F(CRWSessionControllerTest, VisibleItemWithPendingNavigationIndex) {
[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];
+ addPendingItem:GURL("http://www.example.com")
+ referrer:MakeReferrer("http://www.example.com/a")
+ transition:ui::PAGE_TRANSITION_LINK
+ initiationType:web::NavigationInitiationType::USER_INITIATED
+ userAgentOverrideOption:web::NavigationManager::UserAgentOverrideOption::
+ INHERIT];
[session_controller_ commitPendingItem];
[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];
+ addPendingItem:GURL("http://www.example.com/0")
+ referrer:MakeReferrer("http://www.example.com/b")
+ transition:ui::PAGE_TRANSITION_LINK
+ initiationType:web::NavigationInitiationType::USER_INITIATED
+ userAgentOverrideOption:web::NavigationManager::UserAgentOverrideOption::
+ INHERIT];
[session_controller_ commitPendingItem];
[session_controller_ setPendingItemIndex:0];
@@ -1137,16 +1273,20 @@ void SetUp() override {
// 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];
+ addPendingItem:GURL("http://www.example.com")
+ referrer:MakeReferrer("http://www.example.com/a")
+ transition:ui::PAGE_TRANSITION_CLIENT_REDIRECT
+ initiationType:web::NavigationInitiationType::RENDERER_INITIATED
+ userAgentOverrideOption:web::NavigationManager::UserAgentOverrideOption::
+ INHERIT];
[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];
+ 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
+ userAgentOverrideOption:web::NavigationManager::UserAgentOverrideOption::
+ INHERIT];
[session_controller_ commitPendingItem];
EXPECT_EQ(0U, [session_controller_ backwardItems].size());
}
« ios/web/navigation/crw_session_controller.mm ('K') | « ios/web/navigation/crw_session_controller.mm ('k') | ios/web/navigation/navigation_manager_impl.mm » ('j') | ios/web/navigation/navigation_manager_impl_unittest.mm » ('J')

Powered by Google App Engine
This is Rietveld 408576698