Remove webkit's ResourceLoaderBridge interface.

content/child/npapi/plugin_url_fetcher.cc

Index: content/child/npapi/plugin_url_fetcher.cc
diff --git a/content/child/npapi/plugin_url_fetcher.cc b/content/child/npapi/plugin_url_fetcher.cc
index d1c5c248a22dc48776305874f22cd339d1f67d3e..9aa107bd0cb8cc69cbba8dc9414bc42168136d4f 100644
--- a/content/child/npapi/plugin_url_fetcher.cc
+++ b/content/child/npapi/plugin_url_fetcher.cc
@@ -24,7 +24,6 @@
 #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 {
@@ -103,7 +102,8 @@ PluginURLFetcher::PluginURLFetcher(PluginStreamUrl* plugin_stream,
       resource_id_(resource_id),
       copy_stream_data_(copy_stream_data),
       data_offset_(0),
-      pending_failure_notification_(false) {
+      pending_failure_notification_(false),
+      dispatcher_(NULL) {
   RequestInfo request_info;
   request_info.method = method;
   request_info.url = url;
@@ -143,16 +143,15 @@ PluginURLFetcher::PluginURLFetcher(PluginStreamUrl* plugin_stream,
       request_info.headers = std::string("Range: ") + range;
   }
 
-  bridge_.reset(ChildThread::current()->resource_dispatcher()->CreateBridge(
-      request_info));
+  dispatcher_ = ChildThread::current()->resource_dispatcher();

[jam, 2014/04/07 16:43:22]

no need to cache ResourceDispatcher into a member variable. get it from
ChildThread every time

[tfarina, 2014/04/11 01:43:55]

Done.

+  dispatcher_->CreateBridge(request_info);
   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());
+    dispatcher_->SetRequestBody(request_body.get());
   }
 
-  bridge_->Start(this);
+  dispatcher_->Start(this);
 
   // TODO(jam): range requests
 }
@@ -161,7 +160,7 @@ PluginURLFetcher::~PluginURLFetcher() {
 }
 
 void PluginURLFetcher::Cancel() {
-  bridge_->Cancel();
+  dispatcher_->Cancel();
 
   // Due to races and nested event loops, PluginURLFetcher may still receive
   // events from the bridge before being destroyed. Do not forward additional
@@ -178,9 +177,9 @@ void PluginURLFetcher::URLRedirectResponse(bool allow) {
     return;
 
   if (allow) {
-    bridge_->SetDefersLoading(false);
+    dispatcher_->SetDefersLoading(false);
   } else {
-    bridge_->Cancel();
+    dispatcher_->Cancel();
     plugin_stream_->DidFail(resource_id_);  // That will delete |this|.
   }
 }
@@ -231,7 +230,7 @@ bool PluginURLFetcher::OnReceivedRedirect(
     }
   } else {
     // Pause the request while we ask the plugin what to do about the redirect.
-    bridge_->SetDefersLoading(true);
+    dispatcher_->SetDefersLoading(true);
     plugin_stream_->WillSendRequest(url_, response_code);
   }