Call registerLoadRequest with URL instead of VirtualURL.

ios/web/web_state/ui/crw_web_controller.mm

Index: ios/web/web_state/ui/crw_web_controller.mm
diff --git a/ios/web/web_state/ui/crw_web_controller.mm b/ios/web/web_state/ui/crw_web_controller.mm
index da87296de68bf0eaeb586d5777504fa4c72c013c..31356fbb2a44a2876d05b1a63083384a7cc2d317 100644
--- a/ios/web/web_state/ui/crw_web_controller.mm
+++ b/ios/web/web_state/ui/crw_web_controller.mm
@@ -1989,7 +1989,7 @@ const NSTimeInterval kSnapshotOverlayTransition = 0.5;
   [self removeWebViewAllowingCachedReconstruction:NO];
 
   web::NavigationItem* item = [self currentNavItem];
-  const GURL targetURL = item ? item->GetVirtualURL() : GURL::EmptyGURL();
+  const GURL targetURL = item ? item->GetURL() : GURL::EmptyGURL();

[Eugene But (OOO till 7-30), 2016/12/19 17:49:55]

This looks right to me and I tested that Native Content works as expected for
about://terms

   const web::Referrer referrer;
   id<CRWNativeContent> nativeContent =
       [_nativeProvider controllerForURL:targetURL];
@@ -2086,7 +2086,7 @@ const NSTimeInterval kSnapshotOverlayTransition = 0.5;
   [self clearTransientContentView];
 
   web::NavigationItem* item = [self currentNavItem];
-  const GURL currentURL = item ? item->GetVirtualURL() : GURL::EmptyGURL();
+  const GURL currentURL = item ? item->GetURL() : GURL::EmptyGURL();

[Eugene But (OOO till 7-30), 2016/12/19 17:49:55]

This looks right to me and I tested that WebUI works as expected for
about://version page.

   // If it's a chrome URL, but not a native one, create the WebUI instance.
   if (web::GetWebClient()->IsAppSpecificURL(currentURL) &&
       ![_nativeProvider hasControllerForURL:currentURL]) {
@@ -5629,7 +5629,7 @@ const NSTimeInterval kSnapshotOverlayTransition = 0.5;
     [request setHTTPBody:POSTData];
     [request setAllHTTPHeaderFields:[self currentHTTPHeaders]];
     GURL navigationURL =
-        currentItem ? currentItem->GetVirtualURL() : GURL::EmptyGURL();
+        currentItem ? currentItem->GetURL() : GURL::EmptyGURL();

[Eugene But (OOO till 7-30), 2016/12/19 17:49:55]

Changing |loadRequestForCurrentNavigationItem| looks correct to me, though I
would probably pref to land this separately from the previous 2 changes (so if
it breaks something we can revert fewer changes).

     [self registerLoadRequest:navigationURL
                      referrer:[self currentSessionEntryReferrer]
                    transition:[self currentTransition]];
@@ -5639,7 +5639,7 @@ const NSTimeInterval kSnapshotOverlayTransition = 0.5;
 
   ProceduralBlock defaultNavigationBlock = ^{
     web::NavigationItem* item = [self currentNavItem];
-    GURL navigationURL = item ? item->GetVirtualURL() : GURL::EmptyGURL();
+    GURL navigationURL = item ? item->GetURL() : GURL::EmptyGURL();
     [self registerLoadRequest:navigationURL
                      referrer:[self currentSessionEntryReferrer]
                    transition:[self currentTransition]];
@@ -5674,7 +5674,7 @@ const NSTimeInterval kSnapshotOverlayTransition = 0.5;
     // will be a no-op when it is passed the current back forward list item,
     // so |reload| must be explicitly called.
     web::NavigationItem* item = [self currentNavItem];
-    GURL navigationURL = item ? item->GetVirtualURL() : GURL::EmptyGURL();
+    GURL navigationURL = item ? item->GetURL() : GURL::EmptyGURL();
     [self registerLoadRequest:navigationURL
                      referrer:[self currentSessionEntryReferrer]
                    transition:[self currentTransition]];