Remove webkit's ResourceLoaderBridge interface.

content/child/npapi/plugin_url_fetcher.cc

 // Copyright (c) 2013 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.
 
 #include "content/child/npapi/plugin_url_fetcher.h"
 
 #include "base/memory/scoped_ptr.h"
 #include "content/child/child_thread.h"
 #include "content/child/npapi/plugin_host.h"
 #include "content/child/npapi/plugin_instance.h"
 #include "content/child/npapi/plugin_stream_url.h"
 #include "content/child/npapi/webplugin.h"
 #include "content/child/npapi/webplugin_resource_client.h"
 #include "content/child/plugin_messages.h"
 #include "content/child/request_extra_data.h"
 #include "content/child/request_info.h"
 #include "content/child/resource_dispatcher.h"
 #include "content/child/web_url_loader_impl.h"
 #include "content/common/resource_request_body.h"
 #include "content/common/service_worker/service_worker_types.h"
 #include "net/base/load_flags.h"
 #include "net/base/net_errors.h"
 #include "net/http/http_response_headers.h"
 #include "third_party/WebKit/public/platform/WebURLLoaderClient.h"
 #include "third_party/WebKit/public/platform/WebURLResponse.h"
 #include "webkit/child/multipart_response_delegate.h"
-#include "webkit/child/resource_loader_bridge.h"
 #include "webkit/common/resource_response_info.h"
 
 namespace content {
 namespace {
 
 // This class handles individual multipart responses. It is instantiated when
 // we receive HTTP status code 206 in the HTTP response. This indicates
 // that the response could have multiple parts each separated by a boundary
 // specified in the response header.
 // TODO(jam): this is similar to MultiPartResponseClient in webplugin_impl.cc,
@@ skipping 58 matching lines @@
       method_(method),
       referrer_(referrer),
       notify_redirects_(notify_redirects),
       is_plugin_src_load_(is_plugin_src_load),
       origin_pid_(origin_pid),
       render_frame_id_(render_frame_id),
       render_view_id_(render_view_id),
       resource_id_(resource_id),
       copy_stream_data_(copy_stream_data),
       data_offset_(0),
-      pending_failure_notification_(false) {
+      pending_failure_notification_(false),
+      request_id_(-1) {
   RequestInfo request_info;
   request_info.method = method;
   request_info.url = url;
   request_info.first_party_for_cookies = first_party_for_cookies;
   request_info.referrer = referrer;
   request_info.load_flags = net::LOAD_NORMAL;
   request_info.requestor_pid = origin_pid;
   request_info.request_type = ResourceType::OBJECT;
   request_info.routing_id = render_view_id;
 
@@ skipping 19 matching lines @@
     if (!content_type_found) {
       if (!request_info.headers.empty())
         request_info.headers += "\r\n";
       request_info.headers += "Content-Type: application/x-www-form-urlencoded";
     }
   } else {
     if (!range.empty())
       request_info.headers = std::string("Range: ") + range;
   }
 
-  bridge_.reset(ChildThread::current()->resource_dispatcher()->CreateBridge(
-      request_info));
+  ResourceDispatcher* dispatcher =
+      ChildThread::current()->resource_dispatcher();
+
   if (!body.empty()) {
-    scoped_refptr<ResourceRequestBody> request_body =
-        new ResourceRequestBody;
+    scoped_refptr<ResourceRequestBody> request_body = new ResourceRequestBody;
     request_body->AppendBytes(&body[0], body.size());
-    bridge_->SetRequestBody(request_body.get());
+    request_id_ = dispatcher->StartAsync(request_info, request_body, this);

[jam, 2014/04/16 16:24:04]

the StartAsync needs to move out of this ifdef, otherwise you're only starting
it if there's data to send

[tfarina, 2014/04/16 22:33:13]

Done.

   }
 
-  bridge_->Start(this);
-
   // TODO(jam): range requests
 }
 
 PluginURLFetcher::~PluginURLFetcher() {
 }
 
 void PluginURLFetcher::Cancel() {
-  bridge_->Cancel();
+  ChildThread::current()->resource_dispatcher()->Cancel(request_id_);
 
   // Due to races and nested event loops, PluginURLFetcher may still receive
   // events from the bridge before being destroyed. Do not forward additional
   // events back to the plugin, via either |plugin_stream_| or
   // |multipart_delegate_| which has its own pointer via
   // MultiPartResponseClient.
   if (multipart_delegate_)
     multipart_delegate_->Cancel();
   plugin_stream_ = NULL;
 }
 
 void PluginURLFetcher::URLRedirectResponse(bool allow) {
   if (!plugin_stream_)
     return;
 
+  ResourceDispatcher* dispatcher =
+      ChildThread::current()->resource_dispatcher();
+
   if (allow) {
-    bridge_->SetDefersLoading(false);
+    dispatcher->SetDefersLoading(request_id_, false);
   } else {
-    bridge_->Cancel();
+    dispatcher->Cancel(request_id_);
     plugin_stream_->DidFail(resource_id_);  // That will delete |this|.
   }
 }
 
 void PluginURLFetcher::OnUploadProgress(uint64 position, uint64 size) {
 }
 
 bool PluginURLFetcher::OnReceivedRedirect(
     const GURL& new_url,
     const webkit_glue::ResourceResponseInfo& info,
@@ skipping 30 matching lines @@
   // If the plugin does not participate in url redirect notifications then just
   // block cross origin 307 POST redirects.
   if (!notify_redirects_) {
     if (response_code == 307 && method_ == "POST" &&
         old_url.GetOrigin() != new_url.GetOrigin()) {
       plugin_stream_->DidFail(resource_id_);  // That will delete |this|.
       return false;
     }
   } else {
     // Pause the request while we ask the plugin what to do about the redirect.
-    bridge_->SetDefersLoading(true);
+    ResourceDispatcher* dispatcher =
+        ChildThread::current()->resource_dispatcher();
+    dispatcher->SetDefersLoading(request_id_, true);
     plugin_stream_->WillSendRequest(url_, response_code);
   }
 
   return true;
 }
 
 void PluginURLFetcher::OnReceivedResponse(
     const webkit_glue::ResourceResponseInfo& info) {
   if (!plugin_stream_)
     return;
@@ skipping 129 matching lines @@
   }
 
   if (error_code == net::OK) {
     plugin_stream_->DidFinishLoading(resource_id_);
   } else {
     plugin_stream_->DidFail(resource_id_);
   }
 }
 
 }  // namespace content