Index: content/browser/renderer_host/resource_dispatcher_host.cc |
diff --git a/content/browser/renderer_host/resource_dispatcher_host.cc b/content/browser/renderer_host/resource_dispatcher_host.cc |
index 89440cb97d02bba02fbc0cf07a6524fd70307f83..cdf8ee3e2607c953f734a5d58d36dff3d46f9a2a 100644 |
--- a/content/browser/renderer_host/resource_dispatcher_host.cc |
+++ b/content/browser/renderer_host/resource_dispatcher_host.cc |
@@ -393,12 +393,6 @@ void ResourceDispatcherHost::BeginRequest( |
return; |
} |
- // Ensure the Chrome plugins are loaded, as they may intercept network |
- // requests. Does nothing if they are already loaded. |
- // TODO(mpcomplete): This takes 200 ms! Investigate parallelizing this by |
- // starting the load earlier in a BG thread. |
- PluginService::GetInstance()->LoadChromePlugins(this); |
- |
// Construct the event handler. |
scoped_refptr<ResourceHandler> handler; |
if (sync_result) { |
@@ -518,9 +512,7 @@ void ResourceDispatcherHost::BeginRequest( |
upload_size, |
false, // is download |
ResourceType::IsFrame(request_data.resource_type), // allow_download |
- request_data.has_user_gesture, |
- request_data.host_renderer_id, |
- request_data.host_render_view_id); |
+ request_data.has_user_gesture); |
ApplyExtensionLocalizationFilter(request_data.url, request_data.resource_type, |
extra_info); |
SetRequestInfo(request, extra_info); // Request takes ownership. |
@@ -649,9 +641,7 @@ ResourceDispatcherHost::CreateRequestInfoForBrowserRequest( |
0, // upload_size |
download, // is_download |
download, // allow_download |
- false, // has_user_gesture |
- -1, // host renderer id |
- -1); // host render view id |
+ false); // has_user_gesture |
} |
void ResourceDispatcherHost::OnClosePageACK( |
@@ -703,9 +693,6 @@ void ResourceDispatcherHost::BeginDownload( |
NewRunnableFunction(&download_util::NotifyDownloadInitiated, |
child_id, route_id)); |
- // Ensure the Chrome plugins are loaded, as they may intercept network |
- // requests. Does nothing if they are already loaded. |
- PluginService::GetInstance()->LoadChromePlugins(this); |
net::URLRequest* request = new net::URLRequest(url, this); |
request_id_--; |
@@ -756,10 +743,6 @@ void ResourceDispatcherHost::BeginSaveFile( |
if (is_shutdown_) |
return; |
- // Ensure the Chrome plugins are loaded, as they may intercept network |
- // requests. Does nothing if they are already loaded. |
- PluginService::GetInstance()->LoadChromePlugins(this); |
- |
scoped_refptr<ResourceHandler> handler( |
new SaveFileResourceHandler(child_id, |
route_id, |