Extract Peer interface out of ResourceLoaderBridge.

Extract Peer interface out of ResourceLoaderBridge.

This moves it into its own header file in
content/public/child/request_delegate_peer.h

As requested by John in -
https://codereview.chromium.org/186193005/diff/1/content/public/child/resource_loader_bridge.h#newcode133

BUG=265753, 338338, 237249
TEST=content_unittests, unit_tests
R=jam@chromium.org
TBR=darin

Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=261323

[jam, 2014-03-31 17:18:44]

lgtm

https://codereview.chromium.org/218973002/diff/20001/content/public/child/req...
File content/public/child/request_delegate_peer.h (right):

https://codereview.chromium.org/218973002/diff/20001/content/public/child/req...
content/public/child/request_delegate_peer.h:25: // Generated by the bridge.
This is implemented by our custom resource loader
update this comment, there's no bridge anymore (or won't be)

https://codereview.chromium.org/218973002/diff/20001/content/public/child/req...
content/public/child/request_delegate_peer.h:32: class CONTENT_EXPORT
RequestDelegatePeer {
this is a bit of a confusing name, since content/public doesn't have a
RequestDelegate, so having a RequestDelegatePeer doesn't mean much.

How about just RequestPeer?

[tfarina, 2014-04-02 16:18:21]

https://codereview.chromium.org/218973002/diff/20001/content/public/child/req...
File content/public/child/request_delegate_peer.h (right):

https://codereview.chromium.org/218973002/diff/20001/content/public/child/req...
content/public/child/request_delegate_peer.h:25: // Generated by the bridge.
This is implemented by our custom resource loader
On 2014/03/31 17:18:45, jam wrote:
> update this comment, there's no bridge anymore (or won't be)

Done.

https://codereview.chromium.org/218973002/diff/20001/content/public/child/req...
content/public/child/request_delegate_peer.h:32: class CONTENT_EXPORT
RequestDelegatePeer {
On 2014/03/31 17:18:45, jam wrote:
> this is a bit of a confusing name, since content/public doesn't have a
> RequestDelegate, so having a RequestDelegatePeer doesn't mean much.
> 
> How about just RequestPeer?

Done.

[tfarina, 2014-04-02 16:18:34]

The CQ bit was checked by tfarina@chromium.org

[commit-bot: I haz the power, 2014-04-02 16:19:19]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/tfarina@chromium.org/218973002/40001

[commit-bot: I haz the power, 2014-04-02 16:19:28]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2014-04-02 16:19:28]

Failed to apply patch for content/child/resource_dispatcher.cc:
While running patch -p1 --forward --force --no-backup-if-mismatch;
  patching file content/child/resource_dispatcher.cc
  Hunk #1 FAILED at 22.
  Hunk #2 succeeded at 75 (offset -1 lines).
  Hunk #3 succeeded at 174 (offset -10 lines).
  Hunk #4 succeeded at 345 (offset -10 lines).
  Hunk #5 succeeded at 529 (offset -10 lines).
  Hunk #6 succeeded at 553 (offset -10 lines).
  Hunk #7 succeeded at 627 (offset -10 lines).
  Hunk #8 succeeded at 640 (offset -10 lines).
  1 out of 8 hunks FAILED -- saving rejects to file
content/child/resource_dispatcher.cc.rej

Patch:       content/child/resource_dispatcher.cc
Index: content/child/resource_dispatcher.cc
diff --git a/content/child/resource_dispatcher.cc
b/content/child/resource_dispatcher.cc
index
be24da4af1e6da853f4d869a0f0f5e0ad2336c3c..0f96a43ddec7148c042813a6203572e4feaf78c6
100644
--- a/content/child/resource_dispatcher.cc
+++ b/content/child/resource_dispatcher.cc
@@ -22,12 +22,14 @@
 #include "content/common/inter_process_time_ticks_converter.h"
 #include "content/common/resource_messages.h"
 #include "content/common/service_worker/service_worker_types.h"
+#include "content/public/child/request_peer.h"
 #include "content/public/child/resource_dispatcher_delegate.h"
 #include "content/public/common/resource_response.h"
 #include "net/base/net_errors.h"
 #include "net/base/net_util.h"
 #include "net/base/request_priority.h"
 #include "net/http/http_response_headers.h"
+#include "webkit/child/resource_loader_bridge.h"
 #include "webkit/common/resource_type.h"
 
 using webkit_glue::ResourceLoaderBridge;
@@ -76,14 +78,14 @@ class IPCResourceLoaderBridge : public ResourceLoaderBridge
{
 
   // ResourceLoaderBridge
   virtual void SetRequestBody(ResourceRequestBody* request_body) OVERRIDE;
-  virtual bool Start(Peer* peer) OVERRIDE;
+  virtual bool Start(RequestPeer* peer) OVERRIDE;
   virtual void Cancel() OVERRIDE;
   virtual void SetDefersLoading(bool value) OVERRIDE;
   virtual void DidChangePriority(net::RequestPriority new_priority) OVERRIDE;
   virtual void SyncLoad(SyncLoadResponse* response) OVERRIDE;
 
  private:
-  ResourceLoaderBridge::Peer* peer_;
+  RequestPeer* peer_;
 
   // The resource dispatcher for this loader.  The bridge doesn't own it, but
   // it's guaranteed to outlive the bridge.
@@ -184,7 +186,7 @@ void IPCResourceLoaderBridge::SetRequestBody(
 }
 
 // Writes a footer on the message and sends it
-bool IPCResourceLoaderBridge::Start(Peer* peer) {
+bool IPCResourceLoaderBridge::Start(RequestPeer* peer) {
   if (request_id_ != -1) {
     NOTREACHED() << "Starting a request twice";
     return false;
@@ -355,7 +357,7 @@ void ResourceDispatcher::OnReceivedResponse(
   request_info->response_start = ConsumeIOTimestamp();
 
   if (delegate_) {
-    ResourceLoaderBridge::Peer* new_peer =
+    RequestPeer* new_peer =
         delegate_->OnReceivedResponse(
             request_info->peer, response_head.mime_type, request_info->url);
     if (new_peer)
@@ -539,10 +541,10 @@ void ResourceDispatcher::OnRequestComplete(
   request_info->buffer.reset();
   request_info->buffer_size = 0;
 
-  ResourceLoaderBridge::Peer* peer = request_info->peer;
+  RequestPeer* peer = request_info->peer;
 
   if (delegate_) {
-    ResourceLoaderBridge::Peer* new_peer =
+    RequestPeer* new_peer =
         delegate_->OnRequestComplete(
             request_info->peer, request_info->resource_type,
             request_complete_data.error_code);
@@ -563,12 +565,11 @@ void ResourceDispatcher::OnRequestComplete(
                            request_complete_data.encoded_data_length);
 }
 
-int ResourceDispatcher::AddPendingRequest(
-    ResourceLoaderBridge::Peer* callback,
-    ResourceType::Type resource_type,
-    int origin_pid,
-    const GURL& frame_origin,
-    const GURL& request_url) {
+int ResourceDispatcher::AddPendingRequest(RequestPeer* callback,
+                                          ResourceType::Type resource_type,
+                                          int origin_pid,
+                                          const GURL& frame_origin,
+                                          const GURL& request_url) {
   // Compute a unique request_id for this renderer process.
   int id = MakeRequestID();
   pending_requests_[id] = PendingRequestInfo(
@@ -638,7 +639,7 @@ ResourceDispatcher::PendingRequestInfo::PendingRequestInfo()
 }
 
 ResourceDispatcher::PendingRequestInfo::PendingRequestInfo(
-    webkit_glue::ResourceLoaderBridge::Peer* peer,
+    RequestPeer* peer,
     ResourceType::Type resource_type,
     int origin_pid,
     const GURL& frame_origin,
@@ -651,8 +652,7 @@ ResourceDispatcher::PendingRequestInfo::PendingRequestInfo(
       frame_origin(frame_origin),
       response_url(request_url),
       request_start(base::TimeTicks::Now()),
-      blocked_response(false) {
-}
+      blocked_response(false) {}
 
 ResourceDispatcher::PendingRequestInfo::~PendingRequestInfo() {}

[tfarina, 2014-04-02 22:42:39]

The CQ bit was checked by tfarina@chromium.org

[commit-bot: I haz the power, 2014-04-02 22:43:45]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/tfarina@chromium.org/218973002/60001

[commit-bot: I haz the power, 2014-04-02 23:12:10]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2014-04-02 23:12:10]

Retried try job too often on chromium_presubmit for step(s) presubmit
http://build.chromium.org/p/tryserver.chromium/buildstatus?builder=chromium_p...

[tfarina, 2014-04-02 23:41:33]

TBRing Darin for webkit/ changes

[tfarina, 2014-04-02 23:42:04]

The CQ bit was checked by tfarina@chromium.org

[commit-bot: I haz the power, 2014-04-02 23:43:12]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/tfarina@chromium.org/218973002/60001

[commit-bot: I haz the power, 2014-04-03 08:24:49]

Change committed as 261323