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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 2779383002: implement user agent override option. (Closed)
Patch Set: Change if statements to switch Created 3 years, 9 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/navigation_manager_impl.mm ('K') | « ios/web/navigation/navigation_manager_impl.mm ('k') | ios/web/public/navigation_manager.h » ('j') | ios/web/public/navigation_manager.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ios/web/navigation/navigation_manager_impl_unittest.mm
diff --git a/ios/web/navigation/navigation_manager_impl_unittest.mm b/ios/web/navigation/navigation_manager_impl_unittest.mm
index a62143372ff6367ffafada04898f0bc784ea95b5..0e145efff84bd55c7519f5dbf52f61fe8ca76ea4 100644
--- a/ios/web/navigation/navigation_manager_impl_unittest.mm
+++ b/ios/web/navigation/navigation_manager_impl_unittest.mm
@@ -72,7 +72,8 @@ TestNavigationManagerDelegate navigation_manager_delegate() {
TEST_F(NavigationManagerTest, GetPendingItemIndexWithoutPendingEntry) {
navigation_manager()->AddPendingItem(
GURL("http://www.url.com"), Referrer(), ui::PAGE_TRANSITION_TYPED,
- web::NavigationInitiationType::USER_INITIATED);
+ web::NavigationInitiationType::USER_INITIATED,
+ web::NavigationManager::UserAgentOverrideOption::INHERIT);
[session_controller() commitPendingItem];
EXPECT_EQ(-1, navigation_manager()->GetPendingItemIndex());
}
@@ -82,11 +83,13 @@ TestNavigationManagerDelegate navigation_manager_delegate() {
TEST_F(NavigationManagerTest, GetPendingItemIndexWithPendingEntry) {
navigation_manager()->AddPendingItem(
GURL("http://www.url.com"), Referrer(), ui::PAGE_TRANSITION_TYPED,
- web::NavigationInitiationType::USER_INITIATED);
+ web::NavigationInitiationType::USER_INITIATED,
+ web::NavigationManager::UserAgentOverrideOption::INHERIT);
[session_controller() commitPendingItem];
navigation_manager()->AddPendingItem(
GURL("http://www.url.com/0"), Referrer(), ui::PAGE_TRANSITION_TYPED,
- web::NavigationInitiationType::USER_INITIATED);
+ web::NavigationInitiationType::USER_INITIATED,
+ web::NavigationManager::UserAgentOverrideOption::INHERIT);
EXPECT_EQ(0, navigation_manager()->GetPendingItemIndex());
}
@@ -95,11 +98,13 @@ TestNavigationManagerDelegate navigation_manager_delegate() {
TEST_F(NavigationManagerTest, GetPendingItemIndexWithIndexedPendingEntry) {
navigation_manager()->AddPendingItem(
GURL("http://www.url.com"), Referrer(), ui::PAGE_TRANSITION_TYPED,
- web::NavigationInitiationType::USER_INITIATED);
+ web::NavigationInitiationType::USER_INITIATED,
+ web::NavigationManager::UserAgentOverrideOption::INHERIT);
[session_controller() commitPendingItem];
navigation_manager()->AddPendingItem(
GURL("http://www.url.com/0"), Referrer(), ui::PAGE_TRANSITION_TYPED,
- web::NavigationInitiationType::USER_INITIATED);
+ web::NavigationInitiationType::USER_INITIATED,
+ web::NavigationManager::UserAgentOverrideOption::INHERIT);
[session_controller() commitPendingItem];
EXPECT_EQ(-1, navigation_manager()->GetPendingItemIndex());
@@ -128,7 +133,8 @@ TestNavigationManagerDelegate navigation_manager_delegate() {
TEST_F(NavigationManagerTest, CanGoBackWithTransientItemAndCommittedItem) {
navigation_manager()->AddPendingItem(
GURL("http://www.url.com"), Referrer(), ui::PAGE_TRANSITION_TYPED,
- web::NavigationInitiationType::USER_INITIATED);
+ web::NavigationInitiationType::USER_INITIATED,
+ web::NavigationManager::UserAgentOverrideOption::INHERIT);
[session_controller() commitPendingItem];
[session_controller() addTransientItemWithURL:GURL("http://www.url.com/0")];
@@ -141,7 +147,8 @@ TestNavigationManagerDelegate navigation_manager_delegate() {
TEST_F(NavigationManagerTest, CanGoBackWithSingleCommitedItem) {
navigation_manager()->AddPendingItem(
GURL("http://www.url.com"), Referrer(), ui::PAGE_TRANSITION_TYPED,
- web::NavigationInitiationType::USER_INITIATED);
+ web::NavigationInitiationType::USER_INITIATED,
+ web::NavigationManager::UserAgentOverrideOption::INHERIT);
[session_controller() commitPendingItem];
EXPECT_FALSE(navigation_manager()->CanGoBack());
@@ -152,15 +159,18 @@ TestNavigationManagerDelegate navigation_manager_delegate() {
TEST_F(NavigationManagerTest, CanGoBackWithMultipleCommitedItems) {
navigation_manager()->AddPendingItem(
GURL("http://www.url.com"), Referrer(), ui::PAGE_TRANSITION_TYPED,
- web::NavigationInitiationType::USER_INITIATED);
+ web::NavigationInitiationType::USER_INITIATED,
+ web::NavigationManager::UserAgentOverrideOption::INHERIT);
[session_controller() commitPendingItem];
navigation_manager()->AddPendingItem(
GURL("http://www.url.com/0"), Referrer(), ui::PAGE_TRANSITION_TYPED,
- web::NavigationInitiationType::USER_INITIATED);
+ web::NavigationInitiationType::USER_INITIATED,
+ web::NavigationManager::UserAgentOverrideOption::INHERIT);
[session_controller() commitPendingItem];
navigation_manager()->AddPendingItem(
GURL("http://www.url.com/1"), Referrer(), ui::PAGE_TRANSITION_TYPED,
- web::NavigationInitiationType::USER_INITIATED);
+ web::NavigationInitiationType::USER_INITIATED,
+ web::NavigationManager::UserAgentOverrideOption::INHERIT);
[session_controller() commitPendingItem];
EXPECT_TRUE(navigation_manager()->CanGoBack());
@@ -184,16 +194,19 @@ TestNavigationManagerDelegate navigation_manager_delegate() {
TEST_F(NavigationManagerTest, CanGoForwardWithPendingItem) {
navigation_manager()->AddPendingItem(
GURL("http://www.url.com"), Referrer(), ui::PAGE_TRANSITION_TYPED,
- web::NavigationInitiationType::USER_INITIATED);
+ web::NavigationInitiationType::USER_INITIATED,
+ web::NavigationManager::UserAgentOverrideOption::INHERIT);
[session_controller() commitPendingItem];
navigation_manager()->AddPendingItem(
GURL("http://www.url.com/0"), Referrer(), ui::PAGE_TRANSITION_TYPED,
- web::NavigationInitiationType::USER_INITIATED);
+ web::NavigationInitiationType::USER_INITIATED,
+ web::NavigationManager::UserAgentOverrideOption::INHERIT);
[session_controller() commitPendingItem];
[session_controller() goToItemAtIndex:0];
navigation_manager()->AddPendingItem(
GURL("http://www.url.com/1"), Referrer(), ui::PAGE_TRANSITION_TYPED,
- web::NavigationInitiationType::USER_INITIATED);
+ web::NavigationInitiationType::USER_INITIATED,
+ web::NavigationManager::UserAgentOverrideOption::INHERIT);
// Pending entry should not allow going forward.
EXPECT_FALSE(navigation_manager()->CanGoForward());
@@ -212,7 +225,8 @@ TestNavigationManagerDelegate navigation_manager_delegate() {
TEST_F(NavigationManagerTest, CanGoForwardWithSingleCommitedItem) {
navigation_manager()->AddPendingItem(
GURL("http://www.url.com"), Referrer(), ui::PAGE_TRANSITION_TYPED,
- web::NavigationInitiationType::USER_INITIATED);
+ web::NavigationInitiationType::USER_INITIATED,
+ web::NavigationManager::UserAgentOverrideOption::INHERIT);
[session_controller() commitPendingItem];
EXPECT_FALSE(navigation_manager()->CanGoForward());
@@ -223,15 +237,18 @@ TestNavigationManagerDelegate navigation_manager_delegate() {
TEST_F(NavigationManagerTest, CanGoForwardWithMultipleCommitedEntries) {
navigation_manager()->AddPendingItem(
GURL("http://www.url.com"), Referrer(), ui::PAGE_TRANSITION_TYPED,
- web::NavigationInitiationType::USER_INITIATED);
+ web::NavigationInitiationType::USER_INITIATED,
+ web::NavigationManager::UserAgentOverrideOption::INHERIT);
[session_controller() commitPendingItem];
navigation_manager()->AddPendingItem(
GURL("http://www.url.com/0"), Referrer(), ui::PAGE_TRANSITION_TYPED,
- web::NavigationInitiationType::USER_INITIATED);
+ web::NavigationInitiationType::USER_INITIATED,
+ web::NavigationManager::UserAgentOverrideOption::INHERIT);
[session_controller() commitPendingItem];
navigation_manager()->AddPendingItem(
GURL("http://www.url.com/1"), Referrer(), ui::PAGE_TRANSITION_TYPED,
- web::NavigationInitiationType::USER_INITIATED);
+ web::NavigationInitiationType::USER_INITIATED,
+ web::NavigationManager::UserAgentOverrideOption::INHERIT);
[session_controller() commitPendingItem];
EXPECT_FALSE(navigation_manager()->CanGoForward());
@@ -260,25 +277,30 @@ TestNavigationManagerDelegate navigation_manager_delegate() {
TEST_F(NavigationManagerTest, OffsetsWithoutPendingIndex) {
navigation_manager()->AddPendingItem(
GURL("http://www.url.com/0"), Referrer(), ui::PAGE_TRANSITION_LINK,
- web::NavigationInitiationType::USER_INITIATED);
+ web::NavigationInitiationType::USER_INITIATED,
+ web::NavigationManager::UserAgentOverrideOption::INHERIT);
[session_controller() commitPendingItem];
navigation_manager()->AddPendingItem(
GURL("http://www.url.com/redirect"), Referrer(),
ui::PAGE_TRANSITION_CLIENT_REDIRECT,
- web::NavigationInitiationType::USER_INITIATED);
+ web::NavigationInitiationType::USER_INITIATED,
+ web::NavigationManager::UserAgentOverrideOption::INHERIT);
[session_controller() commitPendingItem];
navigation_manager()->AddPendingItem(
GURL("http://www.url.com/1"), Referrer(), ui::PAGE_TRANSITION_LINK,
- web::NavigationInitiationType::USER_INITIATED);
+ web::NavigationInitiationType::USER_INITIATED,
+ web::NavigationManager::UserAgentOverrideOption::INHERIT);
[session_controller() commitPendingItem];
navigation_manager()->AddPendingItem(
GURL("http://www.url.com/2"), Referrer(), ui::PAGE_TRANSITION_LINK,
- web::NavigationInitiationType::USER_INITIATED);
+ web::NavigationInitiationType::USER_INITIATED,
+ web::NavigationManager::UserAgentOverrideOption::INHERIT);
[session_controller() commitPendingItem];
navigation_manager()->AddPendingItem(
GURL("http://www.url.com/redirect"), Referrer(),
ui::PAGE_TRANSITION_CLIENT_REDIRECT,
- web::NavigationInitiationType::USER_INITIATED);
+ web::NavigationInitiationType::USER_INITIATED,
+ web::NavigationManager::UserAgentOverrideOption::INHERIT);
[session_controller() commitPendingItem];
ASSERT_EQ(5, navigation_manager()->GetItemCount());
ASSERT_EQ(4, navigation_manager()->GetLastCommittedItemIndex());
@@ -484,15 +506,18 @@ TestNavigationManagerDelegate navigation_manager_delegate() {
// to it (pending index is 1, current index is 2).
navigation_manager()->AddPendingItem(
GURL("http://www.url.com/0"), Referrer(), ui::PAGE_TRANSITION_LINK,
- web::NavigationInitiationType::USER_INITIATED);
+ web::NavigationInitiationType::USER_INITIATED,
+ web::NavigationManager::UserAgentOverrideOption::INHERIT);
[session_controller() commitPendingItem];
navigation_manager()->AddPendingItem(
GURL("http://www.url.com/1"), Referrer(), ui::PAGE_TRANSITION_LINK,
- web::NavigationInitiationType::USER_INITIATED);
+ web::NavigationInitiationType::USER_INITIATED,
+ web::NavigationManager::UserAgentOverrideOption::INHERIT);
[session_controller() commitPendingItem];
navigation_manager()->AddPendingItem(
GURL("http://www.url.com/2"), Referrer(), ui::PAGE_TRANSITION_LINK,
- web::NavigationInitiationType::USER_INITIATED);
+ web::NavigationInitiationType::USER_INITIATED,
+ web::NavigationManager::UserAgentOverrideOption::INHERIT);
[session_controller() commitPendingItem];
[session_controller() addTransientItemWithURL:GURL("http://www.url.com/1")];
[session_controller() setPendingItemIndex:1];
@@ -514,41 +539,77 @@ TestNavigationManagerDelegate navigation_manager_delegate() {
EXPECT_EQ(0, navigation_manager()->GetIndexForOffset(-1));
}
-// Tests that desktop user agent can be enforced to use for next pending item.
-TEST_F(NavigationManagerTest, OverrideDesktopUserAgent) {
- navigation_manager()->OverrideDesktopUserAgentForNextPendingItem();
+// Tests that desktop user agent can be enforced to use for next pending item
+// when UserAgentOverrideOption is DESKTOP.
+TEST_F(NavigationManagerTest, OverrideUserAgentWithDesktop) {
navigation_manager()->AddPendingItem(
- GURL("http://www.url.com"), Referrer(), ui::PAGE_TRANSITION_TYPED,
- web::NavigationInitiationType::USER_INITIATED);
+ GURL("http://www.1.com"), Referrer(), ui::PAGE_TRANSITION_TYPED,
+ web::NavigationInitiationType::USER_INITIATED,
+ web::NavigationManager::UserAgentOverrideOption::INHERIT);
[session_controller() commitPendingItem];
- NavigationItem* visible_item = navigation_manager()->GetVisibleItem();
- EXPECT_EQ(visible_item->GetUserAgentType(), UserAgentType::DESKTOP);
+ NavigationItem* last_committed_item =
+ navigation_manager()->GetLastCommittedItem();
+ EXPECT_EQ(UserAgentType::MOBILE, last_committed_item->GetUserAgentType());
+
+ navigation_manager()->AddPendingItem(
+ GURL("http://www.2.com"), Referrer(), ui::PAGE_TRANSITION_TYPED,
+ web::NavigationInitiationType::USER_INITIATED,
+ web::NavigationManager::UserAgentOverrideOption::DESKTOP);
+ ASSERT_TRUE(navigation_manager()->GetPendingItem());
+ EXPECT_EQ(UserAgentType::DESKTOP,
+ navigation_manager()->GetPendingItem()->GetUserAgentType());
+}
+
+// Tests that mobile user agent can be enforced to use for next pending item
+// when UserAgentOverrideOption is MOBILE.
+TEST_F(NavigationManagerTest, OverrideUserAgentWithMobile) {
+ navigation_manager()->AddPendingItem(
+ GURL("http://www.1.com"), Referrer(), ui::PAGE_TRANSITION_TYPED,
+ web::NavigationInitiationType::USER_INITIATED,
+ web::NavigationManager::UserAgentOverrideOption::INHERIT);
+ [session_controller() commitPendingItem];
+ NavigationItem* last_committed_item =
+ navigation_manager()->GetLastCommittedItem();
+ last_committed_item->SetUserAgentType(UserAgentType::DESKTOP);
+ EXPECT_EQ(UserAgentType::DESKTOP, last_committed_item->GetUserAgentType());
+
+ navigation_manager()->AddPendingItem(
+ GURL("http://www.2.com"), Referrer(), ui::PAGE_TRANSITION_TYPED,
+ web::NavigationInitiationType::USER_INITIATED,
+ web::NavigationManager::UserAgentOverrideOption::MOBILE);
+ ASSERT_TRUE(navigation_manager()->GetPendingItem());
+ EXPECT_EQ(UserAgentType::MOBILE,
+ navigation_manager()->GetPendingItem()->GetUserAgentType());
}
Eugene But (OOO till 7-30) 2017/03/30 19:21:24 Do you want to add2 more tests: 1.) Adds INHERIT a
liaoyuke 2017/03/30 19:56:25 Done.
-// Tests that the UserAgentType is propagated to subsequent NavigationItems.
-TEST_F(NavigationManagerTest, UserAgentTypePropagation) {
+// Tests that the UserAgentType is propagated to subsequent NavigationItems when
+// UserAgentOverrideOption is INHERIT.
+TEST_F(NavigationManagerTest, OverrideUserAgentWithInherit) {
// Add and commit two NavigationItems.
navigation_manager()->AddPendingItem(
GURL("http://www.1.com"), Referrer(), ui::PAGE_TRANSITION_TYPED,
- web::NavigationInitiationType::USER_INITIATED);
+ web::NavigationInitiationType::USER_INITIATED,
+ web::NavigationManager::UserAgentOverrideOption::INHERIT);
[session_controller() commitPendingItem];
web::NavigationItem* item1 = navigation_manager()->GetLastCommittedItem();
ASSERT_EQ(web::UserAgentType::MOBILE, item1->GetUserAgentType());
navigation_manager()->AddPendingItem(
GURL("http://www.2.com"), Referrer(), ui::PAGE_TRANSITION_TYPED,
- web::NavigationInitiationType::USER_INITIATED);
+ web::NavigationInitiationType::USER_INITIATED,
+ web::NavigationManager::UserAgentOverrideOption::INHERIT);
[session_controller() commitPendingItem];
web::NavigationItem* item2 = navigation_manager()->GetLastCommittedItem();
// Verify that the second item's UserAgentType is equal to the first.
EXPECT_EQ(item1->GetUserAgentType(), item2->GetUserAgentType());
- // Update |item2|'s UA type to DESKTOP and commit a new item.
+ // Update |item2|'s user agent type to DESKTOP and commit a new item.
item2->SetUserAgentType(web::UserAgentType::DESKTOP);
ASSERT_EQ(web::UserAgentType::DESKTOP, item2->GetUserAgentType());
navigation_manager()->AddPendingItem(
GURL("http://www.3.com"), Referrer(), ui::PAGE_TRANSITION_TYPED,
- web::NavigationInitiationType::USER_INITIATED);
+ web::NavigationInitiationType::USER_INITIATED,
+ web::NavigationManager::UserAgentOverrideOption::INHERIT);
[session_controller() commitPendingItem];
web::NavigationItem* item3 = navigation_manager()->GetLastCommittedItem();
@@ -567,20 +628,23 @@ TestNavigationManagerDelegate navigation_manager_delegate() {
// Create two non-native navigations that are separated by a native one.
navigation_manager()->AddPendingItem(
GURL("http://www.1.com"), Referrer(), ui::PAGE_TRANSITION_TYPED,
- web::NavigationInitiationType::USER_INITIATED);
+ web::NavigationInitiationType::USER_INITIATED,
+ web::NavigationManager::UserAgentOverrideOption::INHERIT);
[session_controller() commitPendingItem];
web::NavigationItem* item1 = navigation_manager()->GetLastCommittedItem();
ASSERT_EQ(web::UserAgentType::MOBILE, item1->GetUserAgentType());
navigation_manager()->AddPendingItem(
item1->GetURL().ReplaceComponents(native_scheme_replacement), Referrer(),
- ui::PAGE_TRANSITION_TYPED, web::NavigationInitiationType::USER_INITIATED);
+ ui::PAGE_TRANSITION_TYPED, web::NavigationInitiationType::USER_INITIATED,
+ web::NavigationManager::UserAgentOverrideOption::INHERIT);
[session_controller() commitPendingItem];
web::NavigationItem* native_item1 =
navigation_manager()->GetLastCommittedItem();
ASSERT_EQ(web::UserAgentType::NONE, native_item1->GetUserAgentType());
navigation_manager()->AddPendingItem(
GURL("http://www.2.com"), Referrer(), ui::PAGE_TRANSITION_TYPED,
- web::NavigationInitiationType::USER_INITIATED);
+ web::NavigationInitiationType::USER_INITIATED,
+ web::NavigationManager::UserAgentOverrideOption::INHERIT);
[session_controller() commitPendingItem];
web::NavigationItem* item2 = navigation_manager()->GetLastCommittedItem();
@@ -593,14 +657,16 @@ TestNavigationManagerDelegate navigation_manager_delegate() {
ASSERT_EQ(web::UserAgentType::DESKTOP, item2->GetUserAgentType());
navigation_manager()->AddPendingItem(
item2->GetURL().ReplaceComponents(native_scheme_replacement), Referrer(),
- ui::PAGE_TRANSITION_TYPED, web::NavigationInitiationType::USER_INITIATED);
+ ui::PAGE_TRANSITION_TYPED, web::NavigationInitiationType::USER_INITIATED,
+ web::NavigationManager::UserAgentOverrideOption::INHERIT);
[session_controller() commitPendingItem];
web::NavigationItem* native_item2 =
navigation_manager()->GetLastCommittedItem();
ASSERT_EQ(web::UserAgentType::NONE, native_item2->GetUserAgentType());
navigation_manager()->AddPendingItem(
GURL("http://www.3.com"), Referrer(), ui::PAGE_TRANSITION_TYPED,
- web::NavigationInitiationType::USER_INITIATED);
+ web::NavigationInitiationType::USER_INITIATED,
+ web::NavigationManager::UserAgentOverrideOption::INHERIT);
[session_controller() commitPendingItem];
web::NavigationItem* item3 = navigation_manager()->GetLastCommittedItem();
@@ -630,7 +696,8 @@ TestNavigationManagerDelegate navigation_manager_delegate() {
GURL url_before_reload = GURL("http://www.url.com");
navigation_manager()->AddPendingItem(
url_before_reload, Referrer(), ui::PAGE_TRANSITION_TYPED,
- web::NavigationInitiationType::RENDERER_INITIATED);
+ web::NavigationInitiationType::USER_INITIATED,
+ web::NavigationManager::UserAgentOverrideOption::INHERIT);
navigation_manager()->Reload(web::ReloadType::NORMAL,
false /* check_for_repost */);
@@ -647,7 +714,8 @@ TestNavigationManagerDelegate navigation_manager_delegate() {
GURL url_before_reload = GURL("http://www.url.com");
navigation_manager()->AddPendingItem(
url_before_reload, Referrer(), ui::PAGE_TRANSITION_TYPED,
- web::NavigationInitiationType::USER_INITIATED);
+ web::NavigationInitiationType::USER_INITIATED,
+ web::NavigationManager::UserAgentOverrideOption::INHERIT);
navigation_manager()->Reload(web::ReloadType::NORMAL,
false /* check_for_repost */);
@@ -663,13 +731,15 @@ TestNavigationManagerDelegate navigation_manager_delegate() {
TEST_F(NavigationManagerTest, ReloadLastCommittedItemWithNormalType) {
navigation_manager()->AddPendingItem(
GURL("http://www.url.com/0"), Referrer(), ui::PAGE_TRANSITION_TYPED,
- web::NavigationInitiationType::USER_INITIATED);
+ web::NavigationInitiationType::USER_INITIATED,
+ web::NavigationManager::UserAgentOverrideOption::INHERIT);
[session_controller() commitPendingItem];
GURL url_before_reload = GURL("http://www.url.com/1");
navigation_manager()->AddPendingItem(
url_before_reload, Referrer(), ui::PAGE_TRANSITION_TYPED,
- web::NavigationInitiationType::USER_INITIATED);
+ web::NavigationInitiationType::USER_INITIATED,
+ web::NavigationManager::UserAgentOverrideOption::INHERIT);
[session_controller() commitPendingItem];
navigation_manager()->Reload(web::ReloadType::NORMAL,
@@ -688,18 +758,21 @@ TestNavigationManagerDelegate navigation_manager_delegate() {
ReloadLastCommittedItemWithNormalTypeWithForwardItems) {
navigation_manager()->AddPendingItem(
GURL("http://www.url.com/0"), Referrer(), ui::PAGE_TRANSITION_TYPED,
- web::NavigationInitiationType::USER_INITIATED);
+ web::NavigationInitiationType::USER_INITIATED,
+ web::NavigationManager::UserAgentOverrideOption::INHERIT);
[session_controller() commitPendingItem];
GURL url_before_reload = GURL("http://www.url.com/1");
navigation_manager()->AddPendingItem(
url_before_reload, Referrer(), ui::PAGE_TRANSITION_TYPED,
- web::NavigationInitiationType::USER_INITIATED);
+ web::NavigationInitiationType::USER_INITIATED,
+ web::NavigationManager::UserAgentOverrideOption::INHERIT);
[session_controller() commitPendingItem];
navigation_manager()->AddPendingItem(
GURL("http://www.url.com/2"), Referrer(), ui::PAGE_TRANSITION_TYPED,
- web::NavigationInitiationType::USER_INITIATED);
+ web::NavigationInitiationType::USER_INITIATED,
+ web::NavigationManager::UserAgentOverrideOption::INHERIT);
[session_controller() commitPendingItem];
[session_controller() goToItemAtIndex:1];
@@ -736,7 +809,8 @@ TestNavigationManagerDelegate navigation_manager_delegate() {
TEST_F(NavigationManagerTest, ReloadRendererPendingItemWithOriginalType) {
navigation_manager()->AddPendingItem(
GURL("http://www.url.com"), Referrer(), ui::PAGE_TRANSITION_TYPED,
- web::NavigationInitiationType::RENDERER_INITIATED);
+ web::NavigationInitiationType::USER_INITIATED,
+ web::NavigationManager::UserAgentOverrideOption::INHERIT);
ASSERT_TRUE(navigation_manager()->GetPendingItem());
GURL expected_original_url = GURL("http://www.url.com/original");
navigation_manager()->GetPendingItem()->SetOriginalRequestURL(
@@ -757,7 +831,8 @@ TestNavigationManagerDelegate navigation_manager_delegate() {
TEST_F(NavigationManagerTest, ReloadUserPendingItemWithOriginalType) {
navigation_manager()->AddPendingItem(
GURL("http://www.url.com"), Referrer(), ui::PAGE_TRANSITION_TYPED,
- web::NavigationInitiationType::USER_INITIATED);
+ web::NavigationInitiationType::USER_INITIATED,
+ web::NavigationManager::UserAgentOverrideOption::INHERIT);
ASSERT_TRUE(navigation_manager()->GetPendingItem());
GURL expected_original_url = GURL("http://www.url.com/original");
navigation_manager()->GetPendingItem()->SetOriginalRequestURL(
@@ -778,12 +853,14 @@ TestNavigationManagerDelegate navigation_manager_delegate() {
TEST_F(NavigationManagerTest, ReloadLastCommittedItemWithOriginalType) {
navigation_manager()->AddPendingItem(
GURL("http://www.url.com/0"), Referrer(), ui::PAGE_TRANSITION_TYPED,
- web::NavigationInitiationType::USER_INITIATED);
+ web::NavigationInitiationType::USER_INITIATED,
+ web::NavigationManager::UserAgentOverrideOption::INHERIT);
[session_controller() commitPendingItem];
navigation_manager()->AddPendingItem(
GURL("http://www.url.com/1"), Referrer(), ui::PAGE_TRANSITION_TYPED,
- web::NavigationInitiationType::USER_INITIATED);
+ web::NavigationInitiationType::USER_INITIATED,
+ web::NavigationManager::UserAgentOverrideOption::INHERIT);
GURL expected_original_url = GURL("http://www.url.com/1/original");
ASSERT_TRUE(navigation_manager()->GetPendingItem());
navigation_manager()->GetPendingItem()->SetOriginalRequestURL(
@@ -806,12 +883,14 @@ TestNavigationManagerDelegate navigation_manager_delegate() {
ReloadLastCommittedItemWithOriginalTypeWithForwardItems) {
navigation_manager()->AddPendingItem(
GURL("http://www.url.com/0"), Referrer(), ui::PAGE_TRANSITION_TYPED,
- web::NavigationInitiationType::USER_INITIATED);
+ web::NavigationInitiationType::USER_INITIATED,
+ web::NavigationManager::UserAgentOverrideOption::INHERIT);
[session_controller() commitPendingItem];
navigation_manager()->AddPendingItem(
GURL("http://www.url.com/1"), Referrer(), ui::PAGE_TRANSITION_TYPED,
- web::NavigationInitiationType::USER_INITIATED);
+ web::NavigationInitiationType::USER_INITIATED,
+ web::NavigationManager::UserAgentOverrideOption::INHERIT);
GURL expected_original_url = GURL("http://www.url.com/1/original");
ASSERT_TRUE(navigation_manager()->GetPendingItem());
navigation_manager()->GetPendingItem()->SetOriginalRequestURL(
@@ -820,7 +899,8 @@ TestNavigationManagerDelegate navigation_manager_delegate() {
navigation_manager()->AddPendingItem(
GURL("http://www.url.com/2"), Referrer(), ui::PAGE_TRANSITION_TYPED,
- web::NavigationInitiationType::USER_INITIATED);
+ web::NavigationInitiationType::USER_INITIATED,
+ web::NavigationManager::UserAgentOverrideOption::INHERIT);
[session_controller() commitPendingItem];
[session_controller() goToItemAtIndex:1];
« ios/web/navigation/navigation_manager_impl.mm ('K') | « ios/web/navigation/navigation_manager_impl.mm ('k') | ios/web/public/navigation_manager.h » ('j') | ios/web/public/navigation_manager.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698