Index: content/browser/loader/resource_dispatcher_host_impl.cc |
diff --git a/content/browser/loader/resource_dispatcher_host_impl.cc b/content/browser/loader/resource_dispatcher_host_impl.cc |
index 8cd54dbb292f4a714de9c2f04673d12fdb56f68b..fcc3fcdd6019a176ff0e2d7f8761f3245720f84b 100644 |
--- a/content/browser/loader/resource_dispatcher_host_impl.cc |
+++ b/content/browser/loader/resource_dispatcher_host_impl.cc |
@@ -78,6 +78,7 @@ |
#include "content/common/view_messages.h" |
#include "content/public/browser/browser_thread.h" |
#include "content/public/browser/global_request_id.h" |
+#include "content/public/browser/navigation_ui_data.h" |
#include "content/public/browser/plugin_service.h" |
#include "content/public/browser/resource_dispatcher_host_delegate.h" |
#include "content/public/browser/resource_request_details.h" |
@@ -2070,6 +2071,7 @@ void ResourceDispatcherHostImpl::FinishedWithResourcesForRequest( |
void ResourceDispatcherHostImpl::BeginNavigationRequest( |
ResourceContext* resource_context, |
const NavigationRequestInfo& info, |
+ std::unique_ptr<NavigationUIData> navigation_ui_data, |
NavigationURLLoaderImplCore* loader) { |
// PlzNavigate: BeginNavigationRequest currently should only be used for the |
// browser-side navigations project. |
@@ -2190,6 +2192,8 @@ void ResourceDispatcherHostImpl::BeginNavigationRequest( |
// If in the future this changes this should be updated to somehow get a |
// meaningful value. |
false); // initiated_in_secure_context |
+ extra_info->set_navigation_ui_data(std::move(navigation_ui_data)); |
+ |
// Request takes ownership. |
extra_info->AssociateWithRequest(new_request.get()); |
@@ -2384,6 +2388,7 @@ void ResourceDispatcherHostImpl::StartLoading( |
"456331 ResourceDispatcherHostImpl::StartLoading")); |
ResourceLoader* loader_ptr = loader.get(); |
+ DCHECK(pending_loaders_[info->GetGlobalRequestID()] == nullptr); |
pending_loaders_[info->GetGlobalRequestID()] = std::move(loader); |
loader_ptr->StartRequest(); |