Remove Gears from Chrome

chrome/common/resource_dispatcher.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 "chrome/common/resource_dispatcher.h"
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
@@ skipping 22 matching lines @@
   return next_request_id++;
 }
 
 // ResourceLoaderBridge implementation ----------------------------------------
 
 namespace webkit_glue {
 
 class IPCResourceLoaderBridge : public ResourceLoaderBridge {
  public:
   IPCResourceLoaderBridge(ResourceDispatcher* dispatcher,
-      const webkit_glue::ResourceLoaderBridge::RequestInfo& request_info,
-      int host_renderer_id,
-      int host_render_view_id);
+      const webkit_glue::ResourceLoaderBridge::RequestInfo& request_info);
   virtual ~IPCResourceLoaderBridge();
 
   // ResourceLoaderBridge
   virtual void AppendDataToUpload(const char* data, int data_len);
   virtual void AppendFileRangeToUpload(
       const FilePath& path,
       uint64 offset,
       uint64 length,
       const base::Time& expected_modification_time);
   virtual void AppendBlobToUpload(const GURL& blob_url);
@@ skipping 12 matching lines @@
 
   // The request to send, created on initialization for modification and
   // appending data.
   ViewHostMsg_Resource_Request request_;
 
   // ID for the request, valid once Start()ed, -1 if not valid yet.
   int request_id_;
 
   // The routing id used when sending IPC messages.
   int routing_id_;
-
-  // The following two members are specified if the request is initiated by
-  // a plugin like Gears.
-
-  // Contains the id of the host renderer.
-  int host_renderer_id_;
-
-  // Contains the id of the host render view.
-  int host_render_view_id_;
 };
 
 IPCResourceLoaderBridge::IPCResourceLoaderBridge(
     ResourceDispatcher* dispatcher,
-    const webkit_glue::ResourceLoaderBridge::RequestInfo& request_info,
-    int host_renderer_id,
-    int host_render_view_id)
+    const webkit_glue::ResourceLoaderBridge::RequestInfo& request_info)
     : peer_(NULL),
       dispatcher_(dispatcher),
       request_id_(-1),
-      routing_id_(request_info.routing_id),
-      host_renderer_id_(host_renderer_id),
-      host_render_view_id_(host_render_view_id) {
+      routing_id_(request_info.routing_id) {
   DCHECK(dispatcher_) << "no resource dispatcher";
   request_.method = request_info.method;
   request_.url = request_info.url;
   request_.first_party_for_cookies = request_info.first_party_for_cookies;
   request_.referrer = request_info.referrer;
   request_.headers = request_info.headers;
   request_.load_flags = request_info.load_flags;
   request_.origin_pid = request_info.requestor_pid;
   request_.resource_type = request_info.request_type;
   request_.request_context = request_info.request_context;
   request_.appcache_host_id = request_info.appcache_host_id;
   request_.download_to_file = request_info.download_to_file;
   request_.has_user_gesture = request_info.has_user_gesture;
-  request_.host_renderer_id = host_renderer_id_;
-  request_.host_render_view_id = host_render_view_id_;
 }
 
 IPCResourceLoaderBridge::~IPCResourceLoaderBridge() {
   // we remove our hook for the resource dispatcher only when going away, since
   // it doesn't keep track of whether we've force terminated the request
   if (request_id_ >= 0) {
     // this operation may fail, as the dispatcher will have preemptively
     // removed us when the renderer sends the ReceivedAllData message.
     dispatcher_->RemovePendingRequest(request_id_);
 
@@ skipping 429 matching lines @@
       PendingRequestInfo& pending_request = index->second;
       if (pending_request.is_deferred) {
         pending_request.deferred_message_queue.swap(q);
         return;
       }
     }
   }
 }
 
 webkit_glue::ResourceLoaderBridge* ResourceDispatcher::CreateBridge(
-    const webkit_glue::ResourceLoaderBridge::RequestInfo& request_info,
-    int host_renderer_id,
-    int host_render_view_id) {
-  return new webkit_glue::IPCResourceLoaderBridge(this, request_info,
-                                                  host_renderer_id,
-                                                  host_render_view_id);
+    const webkit_glue::ResourceLoaderBridge::RequestInfo& request_info) {
+  return new webkit_glue::IPCResourceLoaderBridge(this, request_info);
 }
 
 bool ResourceDispatcher::IsResourceDispatcherMessage(
     const IPC::Message& message) {
   switch (message.type()) {
     case ViewMsg_Resource_UploadProgress::ID:
     case ViewMsg_Resource_ReceivedResponse::ID:
     case ViewMsg_Resource_ReceivedCachedMetadata::ID:
     case ViewMsg_Resource_ReceivedRedirect::ID:
     case ViewMsg_Resource_DataReceived::ID:
@@ skipping 32 matching lines @@
 
 // static
 void ResourceDispatcher::ReleaseResourcesInMessageQueue(MessageQueue* queue) {
   while (!queue->empty()) {
     IPC::Message* message = queue->front();
     ReleaseResourcesInDataMessage(*message);
     queue->pop_front();
     delete message;
   }
 }