Remove Gears from Chrome

content/browser/renderer_host/resource_dispatcher_host.cc

 // Copyright (c) 2011 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.
 
 // See http://dev.chromium.org/developers/design-documents/multi-process-resource-loading
 
 #include "content/browser/renderer_host/resource_dispatcher_host.h"
 
 #include <set>
 #include <vector>
@@ skipping 342 matching lines @@
 
 void ResourceDispatcherHost::BeginRequest(
     int request_id,
     const ResourceHostMsg_Request& request_data,
     IPC::Message* sync_result,  // only valid for sync
     int route_id) {
   ChildProcessInfo::ProcessType process_type = filter_->process_type();
   int child_id = filter_->child_id();
 
   ChromeURLRequestContext* context = filter_->GetURLRequestContext(
-      request_data);
+      request_data.resource_type);
 
   // Might need to resolve the blob references in the upload data.
   if (request_data.upload_data && context) {
     context->blob_storage_context()->controller()->
         ResolveBlobReferencesInUploadData(request_data.upload_data.get());
   }
 
   if (is_shutdown_ ||
       !ShouldServiceRequest(process_type, child_id, request_data)) {
     net::URLRequestStatus status(net::URLRequestStatus::FAILED,
                                  net::ERR_ABORTED);
     if (sync_result) {
       SyncLoadResult result;
       result.status = status;
       ResourceHostMsg_SyncLoad::WriteReplyParams(sync_result, result);
       filter_->Send(sync_result);
     } else {
       // Tell the renderer that this request was disallowed.
       filter_->Send(new ResourceMsg_RequestComplete(
           route_id,
           request_id,
           status,
           std::string(),   // No security info needed, connection was not
           base::Time()));  // established.
     }
     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) {
     handler = new SyncResourceHandler(
         filter_, request_data.url, sync_result, this);
   } else {
     handler = new AsyncResourceHandler(
         filter_, route_id, request_data.url, this);
   }
 
@@ skipping 103 matching lines @@
       new ResourceDispatcherHostRequestInfo(
           handler,
           process_type,
           child_id,
           route_id,
           request_id,
           request_data.resource_type,
           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);
   SetRequestInfo(request, extra_info);  // Request takes ownership.
   chrome_browser_net::SetOriginPIDForRequest(
       request_data.origin_pid, request);
 
   if (request->url().SchemeIs(chrome::kBlobScheme) && context) {
     // Hang on to a reference to ensure the blob is not released prior
     // to the job being started.
     webkit_blob::BlobStorageController* controller =
         context->blob_storage_context()->controller();
     extra_info->set_requested_blob_data(
@@ skipping 106 matching lines @@
     ResourceHandler* handler, int child_id, int route_id, bool download) {
   return new ResourceDispatcherHostRequestInfo(handler,
                                                ChildProcessInfo::RENDER_PROCESS,
                                                child_id,
                                                route_id,
                                                request_id_,
                                                ResourceType::SUB_RESOURCE,
                                                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(
     const ViewMsg_ClosePage_Params& params) {
   if (params.for_cross_site_transition) {
     // Closes for cross-site transitions are handled such that the cross-site
     // transition continues.
     GlobalRequestID global_id(params.new_render_process_host_id,
                               params.new_request_id);
     PendingRequestList::iterator i = pending_requests_.find(global_id);
@@ skipping 31 matching lines @@
     VLOG(1) << "Denied unauthorized download request for "
             << url.possibly_invalid_spec();
     return;
   }
 
   BrowserThread::PostTask(
       BrowserThread::UI, FROM_HERE,
       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_--;
 
   scoped_refptr<ResourceHandler> handler(
       new DownloadResourceHandler(this,
                                   child_id,
                                   route_id,
                                   request_id_,
                                   url,
@@ skipping 30 matching lines @@
 // This function is only used for saving feature.
 void ResourceDispatcherHost::BeginSaveFile(
     const GURL& url,
     const GURL& referrer,
     int child_id,
     int route_id,
     net::URLRequestContext* request_context) {
   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,
                                   url,
                                   save_file_manager_.get()));
   request_id_--;
 
   bool known_proto = net::URLRequest::IsHandledURL(url);
   if (!known_proto) {
     // Since any URLs which have non-standard scheme have been filtered
@@ skipping 1187 matching lines @@
   return is_prefetch_enabled_;
 }
 
 // static
 void ResourceDispatcherHost::set_is_prefetch_enabled(bool value) {
   is_prefetch_enabled_ = value;
 }
 
 // static
 bool ResourceDispatcherHost::is_prefetch_enabled_ = false;