Browser test for LoadDataWithBaseURL reload

content/browser/frame_host/navigator_impl.cc

 // Copyright 2013 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.
 
 #include "content/browser/frame_host/navigator_impl.h"
 
 #include "base/command_line.h"
 #include "base/metrics/histogram.h"
 #include "base/time/time.h"
 #include "content/browser/frame_host/frame_tree.h"
@@ skipping 475 matching lines @@
     // Whether or not a page transition was triggered by going backward or
     // forward in the history is only stored in the navigation controller's
     // entry list.
     if (did_navigate &&
         (controller_->GetLastCommittedEntry()->GetTransitionType() &
             ui::PAGE_TRANSITION_FORWARD_BACK)) {
       transition_type = ui::PageTransitionFromInt(
           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);
     render_frame_host->SetNavigationHandle(nullptr);
   }
 
   if (!did_navigate)
     return;  // No navigation happened.
 
   // DO NOT ADD MORE STUFF TO THIS FUNCTION! Your component should either listen
@@ skipping 452 matching lines @@
       entry->set_should_replace_entry(pending_entry->should_replace_entry());
       entry->SetRedirectChain(pending_entry->GetRedirectChain());
     }
     controller_->SetPendingEntry(entry.Pass());
     if (delegate_)
       delegate_->NotifyChangedNavigationState(content::INVALIDATE_TYPE_URL);
   }
 }
 
 }  // namespace content