Browser test for LoadDataWithBaseURL reload

content/browser/frame_host/navigator_impl.cc

Index: content/browser/frame_host/navigator_impl.cc
diff --git a/content/browser/frame_host/navigator_impl.cc b/content/browser/frame_host/navigator_impl.cc
index ce8891c9dc0e4e01226259682576218f197ae006..0083b02b2bc89395ca9810e1da6751f3e52256eb 100644
--- a/content/browser/frame_host/navigator_impl.cc
+++ b/content/browser/frame_host/navigator_impl.cc
@@ -493,8 +493,12 @@ void NavigatorImpl::DidNavigate(
           params.transition | ui::PAGE_TRANSITION_FORWARD_BACK);
     }
 
-    delegate_->DidCommitProvisionalLoad(render_frame_host,
-                                        params.url,
+    NavigationEntryImpl* entry = controller_->GetLastCommittedEntry();

[Charlie Reis, 2015/11/20 21:30:12]

I'm a little concerned about this particular change because other similar APIs
(like DidNavigateMainFramePostCommit below) also expose the data URL (via
params).  This causes us to have inconsistent behavior across APIs.

Is there any way that we could update the delegates instead, if they were
expecting the virtual URL?

(At the least, we'll need a comment indicating why this is necessary, but it
would be good to avoid this block if we can.)

[boliu, 2015/11/23 22:32:25]

Moved this change to extensions/browser/guest_view/web_view/web_view_guest.cc

[Charlie Reis, 2015/11/24 00:22:59]

Much better-- thanks!

+    bool use_virtual_url = entry->GetVirtualURL().is_valid() &&

[Charlie Reis, 2015/11/20 21:30:12]

This condition is kind of a no-op, because GetVirtualURL() will return GetURL()
if there is no virtual URL.  It would be hard to get back an invalid URL here.

+                           entry->GetBaseURLForDataURL().is_valid() &&
+                           entry->GetURL().SchemeIs(url::kDataScheme);
+    GURL url = use_virtual_url ? entry->GetVirtualURL() : params.url;
+    delegate_->DidCommitProvisionalLoad(render_frame_host, url,
                                         transition_type);
     render_frame_host->navigation_handle()->DidCommitNavigation(
         is_navigation_within_page, render_frame_host);