Reland "[Nav Experiment] Propagate virtual URL in ReloadWithUserAgentType."

Fixed broken unit test reported in crbug.com/834307

This is a reland of f1291fb3

Original change's description:
> [Nav Experiment] Propagate virtual URL in ReloadWithUserAgentType.
>
> This hides the internal URL used by WKBasedNavigationManager to force
> create an entry in WKBackForwardList when reloading with a different
> user agent type (see crrev.com/c/919175).
>
> Also fixed a bug in NavigationManagerTest which wasn't testing the
> redirect case when GetParam() == TEST_WK_BASED_NAVIGATION_MANAGER.
>
> Bug: 833958
> Cq-Include-Trybots: master.tryserver.chromium.mac:ios-simulator-cronet;master.tryserver.chromium.mac:ios-simulator-full-configs
> Change-Id: I095178302bfc4d209c2d058aab736777cc8b2de4
> Reviewed-on: https://chromium-review.googlesource.com/1016002
> Reviewed-by: Eugene But <eugenebut@chromium.org>
> Commit-Queue: Danyao Wang <danyao@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#551548}

Bug: 833958,834307
Change-Id: I9856f340e408d92fbce934f8ae2bbddb119b066d
Cq-Include-Trybots: master.tryserver.chromium.mac:ios-simulator-cronet;master.tryserver.chromium.mac:ios-simulator-full-configs
Reviewed-on: https://chromium-review.googlesource.com/1017005Reviewed-by: Eugene But <eugenebut@chromium.org>
Commit-Queue: Danyao Wang <danyao@chromium.org>
Cr-Commit-Position: refs/heads/master@{#551781}

ios/web/navigation/navigation_manager_impl.mm

@@ -348,19 +348,21 @@ void NavigationManagerImpl::ReloadWithUserAgentType(
     return;
 
   // |reloadURL| will be empty if a page was open by DOM.
-  GURL reloadURL(last_non_redirect_item->GetOriginalRequestURL());
-  if (reloadURL.is_empty()) {
-    reloadURL = last_non_redirect_item->GetVirtualURL();
+  GURL reload_url(last_non_redirect_item->GetOriginalRequestURL());
+  if (reload_url.is_empty()) {
+    reload_url = last_non_redirect_item->GetVirtualURL();
   }
 
   // Reload using a client-side redirect URL to create a new entry in
   // WKBackForwardList for the new user agent type. This hack is not needed for
   // LegacyNavigationManagerImpl which manages its own history entries.
   if (web::GetWebClient()->IsSlimNavigationManagerEnabled()) {
-    reloadURL = wk_navigation_util::CreateRedirectUrl(reloadURL);
+    reload_url = wk_navigation_util::CreateRedirectUrl(reload_url);
   }
 
-  WebLoadParams params(reloadURL);
+  WebLoadParams params(reload_url);
+  if (last_non_redirect_item->GetVirtualURL() != reload_url)
+    params.virtual_url = last_non_redirect_item->GetVirtualURL();
   params.referrer = last_non_redirect_item->GetReferrer();
   params.transition_type = ui::PAGE_TRANSITION_RELOAD;
 

ios/web/navigation/navigation_manager_impl_unittest.mm

@@ -10,14 +10,18 @@
 #include "base/logging.h"
 #include "base/mac/bind_objc_block.h"
 #include "base/strings/sys_string_conversions.h"
+#include "base/test/scoped_feature_list.h"
 #import "ios/web/navigation/crw_session_controller+private_constructors.h"
 #import "ios/web/navigation/legacy_navigation_manager_impl.h"
 #import "ios/web/navigation/navigation_manager_delegate.h"
 #import "ios/web/navigation/wk_based_navigation_manager_impl.h"
+#import "ios/web/navigation/wk_navigation_util.h"
+#include "ios/web/public/features.h"
 #include "ios/web/public/load_committed_details.h"
 #include "ios/web/public/navigation_item.h"
 #include "ios/web/public/test/fakes/test_browser_state.h"
 #import "ios/web/public/test/fakes/test_navigation_manager.h"
+#import "ios/web/public/web_client.h"
 #import "ios/web/test/fakes/crw_fake_back_forward_list.h"
 #include "ios/web/test/test_url_constants.h"
 #import "ios/web/web_state/ui/crw_web_view_navigation_proxy.h"
@@ -114,11 +118,14 @@ class NavigationManagerTest
  protected:
   NavigationManagerTest() {
     if (GetParam() == TEST_LEGACY_NAVIGATION_MANAGER) {
+      feature_list_.InitAndDisableFeature(
+          web::features::kSlimNavigationManager);
       manager_.reset(new LegacyNavigationManagerImpl);
       controller_ =
           [[CRWSessionController alloc] initWithBrowserState:&browser_state_];
       delegate_.SetSessionController(session_controller());
     } else {
+      feature_list_.InitAndEnableFeature(web::features::kSlimNavigationManager);
       manager_.reset(new WKBasedNavigationManagerImpl);
       mock_web_view_ = OCMClassMock([WKWebView class]);
       mock_wk_list_ = [[CRWFakeBackForwardList alloc] init];
@@ -156,6 +163,7 @@ class NavigationManagerTest
 
   CRWFakeBackForwardList* mock_wk_list_;
   WKWebView* mock_web_view_;
+  base::test::ScopedFeatureList feature_list_;
 
  private:
   TestBrowserState browser_state_;
@@ -1742,6 +1750,8 @@ TEST_P(NavigationManagerTest, ReloadWithUserAgentType) {
       url, Referrer(), ui::PAGE_TRANSITION_TYPED,
       NavigationInitiationType::USER_INITIATED,
       NavigationManager::UserAgentOverrideOption::MOBILE);
+  GURL virtual_url("http://www.1.com/virtual");
+  navigation_manager()->GetPendingItem()->SetVirtualURL(virtual_url);
   [mock_wk_list_ setCurrentURL:@"http://www.1.com"];
   navigation_manager()->CommitPendingItem();
 
@@ -1753,7 +1763,15 @@ TEST_P(NavigationManagerTest, ReloadWithUserAgentType) {
   navigation_manager()->ReloadWithUserAgentType(UserAgentType::DESKTOP);
 
   NavigationItem* pending_item = navigation_manager()->GetPendingItem();
-  EXPECT_EQ(url, pending_item->GetURL());
+  if (!web::GetWebClient()->IsSlimNavigationManagerEnabled()) {
+    EXPECT_EQ(url, pending_item->GetURL());
+  } else {
+    GURL reload_target_url;
+    ASSERT_TRUE(wk_navigation_util::ExtractTargetURL(pending_item->GetURL(),
+                                                     &reload_target_url));
+    EXPECT_EQ(url, reload_target_url);
+  }
+  EXPECT_EQ(virtual_url, pending_item->GetVirtualURL());
   EXPECT_EQ(UserAgentType::DESKTOP, pending_item->GetUserAgentType());
 }