Call registerLoadRequest with URL instead of VirtualURL.

ios/web/web_state/ui/crw_web_controller.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/web_state/ui/crw_web_controller.h"
 
 #import <WebKit/WebKit.h>
 
 #import <objc/runtime.h>
 #include <stddef.h>
@@ skipping 1971 matching lines @@
   [self loadNativeViewWithSuccess:NO];
 }
 
 // Load the current URL in a native controller, retrieved from the native
 // provider. Call |loadNativeViewWithSuccess:YES| to load the native controller.
 - (void)loadCurrentURLInNativeView {
   // Free the web view.
   [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];
   // Unlike the WebView case, always create a new controller and view.
   // TODO(pinkerton): What to do if this does return nil?
   [self setNativeController:nativeContent];
   if ([nativeContent respondsToSelector:@selector(virtualURL)]) {
     item->SetVirtualURL([nativeContent virtualURL]);
   }
   [self registerLoadRequest:targetURL

[Olivier, 2016/12/19 20:09:55]

I can split the CL, but please note that because of this call, the two CL will
be dependent.

[kkhorimoto, 2016/12/19 21:11:54]

You can upload dependent CLs by using 'git-new-branch --upstream-current'

[Olivier, 2016/12/19 21:19:09]

OK.
Splitting the CL will also mean adapt the unittests and revert the adapt in
second CL (see patch set 2 in this CL)..
I will check if the failure is coherent or if the two changes are really
interdependant.

                    referrer:referrer
                  transition:[self currentTransition]];
   [self loadNativeViewWithSuccess:YES];
 }
 
 - (void)loadWithParams:(const NavigationManager::WebLoadParams&)originalParams {
   // Make a copy of |params|, as some of the delegate methods may modify it.
   NavigationManager::WebLoadParams params(originalParams);
 
   // Initiating a navigation from the UI, record the current page state before
@@ skipping 66 matching lines @@
   // Abort any outstanding page load. This ensures the delegate gets informed
   // about the outgoing page, and further messages from the page are suppressed.
   if (_loadPhase != web::PAGE_LOADED)
     [self abortLoad];
 
   DCHECK(!_isHalted);
   // Remove the transient content view.
   [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]) {
     if (!(item->GetTransitionType() & ui::PAGE_TRANSITION_TYPED ||
           item->GetTransitionType() & ui::PAGE_TRANSITION_AUTO_BOOKMARK) &&
         self.sessionController.openedByDOM) {
       // WebUI URLs can not be opened by DOM to prevent cross-site scripting as
       // they have increased power. WebUI URLs may only be opened when the user
       // types in the URL or use bookmarks.
       [[self sessionController] discardNonCommittedEntries];
@@ skipping 3522 matching lines @@
   NSData* POSTData = currentItem->GetPostData();
   NSMutableURLRequest* request = [self requestForCurrentNavigationItem];
 
   // If the request has POST data and is not a form resubmission, configure and
   // run the POST request.
   if (POSTData.length && !isFormPOSTResubmission) {
     [request setHTTPMethod:@"POST"];
     [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]];
     [self loadPOSTRequest:request];
     return;
   }
 
   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]];
     [self loadRequest:request];
   };
 
   // When navigating via WKBackForwardListItem to pages created or updated by
   // calls to pushState() and replaceState(), sometimes core.js is not injected
   // correctly.  This means that calling window.history navigation functions
   // will invoke WKWebView's non-overridden implementations, causing a mismatch
@@ skipping 14 matching lines @@
     defaultNavigationBlock();
     return;
   }
 
   ProceduralBlock webViewNavigationBlock = ^{
     // If the current navigation URL is the same as the URL of the visible
     // page, that means the user requested a reload. |goToBackForwardListItem|
     // 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]];
     if (navigationURL == net::GURLWithNSURL([_webView URL])) {
       [_webView reload];
     } else {
       // |didCommitNavigation:| may not be called for fast navigation, so update
       // the navigation type now as it is already known.
       holder->set_navigation_type(WKNavigationTypeBackForward);
       [_webView goToBackForwardListItem:holder->back_forward_list_item()];
@@ skipping 95 matching lines @@
   }
 
   return web::WEB_VIEW_DOCUMENT_TYPE_GENERIC;
 }
 
 - (NSString*)refererFromNavigationAction:(WKNavigationAction*)action {
   return [action.request valueForHTTPHeaderField:@"Referer"];
 }
 
 @end