| Index: chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate.cc
|
| diff --git a/chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate.cc b/chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate.cc
|
| index 73cf08bb293dcefa3f1be1e39bc46727d03628af..774cef9b4bb3a9d230c546f447edb5f867d9359f 100644
|
| --- a/chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate.cc
|
| +++ b/chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate.cc
|
| @@ -23,39 +23,42 @@
|
| #include "chrome/browser/download/download_resource_throttle.h"
|
| #include "chrome/browser/mod_pagespeed/mod_pagespeed_metrics.h"
|
| #include "chrome/browser/net/resource_prefetch_predictor_observer.h"
|
| #include "chrome/browser/plugins/plugin_prefs.h"
|
| #include "chrome/browser/prerender/prerender_manager.h"
|
| #include "chrome/browser/prerender/prerender_manager_factory.h"
|
| #include "chrome/browser/prerender/prerender_resource_throttle.h"
|
| #include "chrome/browser/prerender/prerender_util.h"
|
| #include "chrome/browser/profiles/profile.h"
|
| #include "chrome/browser/profiles/profile_io_data.h"
|
| +#include "chrome/browser/renderer_host/chrome_navigation_data.h"
|
| #include "chrome/browser/renderer_host/safe_browsing_resource_throttle.h"
|
| #include "chrome/browser/renderer_host/thread_hop_resource_throttle.h"
|
| #include "chrome/browser/safe_browsing/safe_browsing_service.h"
|
| #include "chrome/browser/search/search.h"
|
| #include "chrome/browser/search_engines/template_url_service_factory.h"
|
| #include "chrome/browser/signin/chrome_signin_helper.h"
|
| #include "chrome/browser/tab_contents/tab_util.h"
|
| #include "chrome/browser/ui/login/login_handler.h"
|
| #include "chrome/common/chrome_switches.h"
|
| #include "chrome/common/features.h"
|
| #include "chrome/common/url_constants.h"
|
| #include "components/content_settings/core/browser/host_content_settings_map.h"
|
| +#include "components/data_reduction_proxy/core/browser/data_reduction_proxy_data.h"
|
| #include "components/data_reduction_proxy/core/browser/data_reduction_proxy_io_data.h"
|
| #include "components/google/core/browser/google_util.h"
|
| #include "components/policy/core/common/cloud/policy_header_io_helper.h"
|
| #include "components/search_engines/template_url_prepopulate_data.h"
|
| #include "components/search_engines/template_url_service.h"
|
| #include "components/variations/net/variations_http_headers.h"
|
| #include "content/public/browser/browser_thread.h"
|
| +#include "content/public/browser/navigation_data.h"
|
| #include "content/public/browser/notification_service.h"
|
| #include "content/public/browser/plugin_service.h"
|
| #include "content/public/browser/plugin_service_filter.h"
|
| #include "content/public/browser/render_process_host.h"
|
| #include "content/public/browser/render_view_host.h"
|
| #include "content/public/browser/resource_context.h"
|
| #include "content/public/browser/resource_dispatcher_host.h"
|
| #include "content/public/browser/resource_request_info.h"
|
| #include "content/public/browser/service_worker_context.h"
|
| #include "content/public/browser/stream_info.h"
|
| @@ -792,10 +795,29 @@ bool ChromeResourceDispatcherHostDelegate::ShouldEnableLoFiMode(
|
| return data_reduction_proxy_io_data->ShouldEnableLoFiMode(url_request);
|
| return false;
|
| }
|
|
|
| // static
|
| void ChromeResourceDispatcherHostDelegate::
|
| SetExternalProtocolHandlerDelegateForTesting(
|
| ExternalProtocolHandler::Delegate* delegate) {
|
| g_external_protocol_handler_delegate = delegate;
|
| }
|
| +
|
| +content::NavigationData*
|
| +ChromeResourceDispatcherHostDelegate::GetNavigationData(
|
| + net::URLRequest* request) const {
|
| + ChromeNavigationData* data =
|
| + ChromeNavigationData::GetDataAndCreateIfNecessary(request);
|
| + if (!request)
|
| + return data;
|
| +
|
| + data_reduction_proxy::DataReductionProxyData* data_reduction_proxy_data =
|
| + data_reduction_proxy::DataReductionProxyData::GetData(*request);
|
| + // DeepCopy the DataReductionProxyData from the URLRequest to prevent the
|
| + // URLRequest and DataReductionProxyData from both having ownership of the
|
| + // same object. This copy will be shortlived as it will be deep copied again
|
| + // when content makes a clone of NavigationData for the UI thread.
|
| + if (data_reduction_proxy_data)
|
| + data->SetDataReductionProxyData(data_reduction_proxy_data->DeepCopy());
|
| + return data;
|
| +}
|
|
|