Remove webkit's ResourceLoaderBridge interface.

content/child/resource_dispatcher.h

 // Copyright (c) 2012 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
 
 #ifndef CONTENT_CHILD_RESOURCE_DISPATCHER_H_
 #define CONTENT_CHILD_RESOURCE_DISPATCHER_H_
 
 #include <deque>
@@ skipping 13 matching lines @@
 struct ResourceMsg_RequestCompleteData;
 
 namespace webkit_glue {
 class ResourceLoaderBridge;
 struct ResourceResponseInfo;
 }
 
 namespace content {
 class RequestPeer;
 class ResourceDispatcherDelegate;
+class ResourceRequestBody;
 struct RequestInfo;
 struct ResourceResponseHead;
 struct SiteIsolationResponseMetaData;
+struct SyncLoadResponse;
 
 // This class serves as a communication interface between the
 // ResourceDispatcherHost in the browser process and the ResourceLoaderBridge in
 // the child process.  It can be used from any child process.
 class CONTENT_EXPORT ResourceDispatcher : public IPC::Listener {
  public:
   explicit ResourceDispatcher(IPC::Sender* sender);
   virtual ~ResourceDispatcher();
 
   // IPC::Listener implementation.
   virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE;
 
-  // Creates a ResourceLoaderBridge for this type of dispatcher, this is so
-  // this can be tested regardless of the ResourceLoaderBridge::Create
-  // implementation.
-  webkit_glue::ResourceLoaderBridge* CreateBridge(
-      const RequestInfo& request_info);
+  void CreateBridge(const RequestInfo& request_info);
+  void SetRequestBody(ResourceRequestBody* request_body);
+  bool Start(RequestPeer* peer);
+  void Cancel();
+  void SetDefersLoading(bool value);
+  void DidChangePriority(net::RequestPriority new_priority);
+  void SyncLoad(SyncLoadResponse* response);
 
   // Adds a request from the pending_requests_ list, returning the new
   // requests' ID
   int AddPendingRequest(RequestPeer* callback,
                         ResourceType::Type resource_type,
                         int origin_pid,
                         const GURL& frame_origin,
                         const GURL& request_url);
 
   // Removes a request from the pending_requests_ list, returning true if the
@@ skipping 20 matching lines @@
     delegate_ = delegate;
   }
 
   // Remembers IO thread timestamp for next resource message.
   void set_io_timestamp(base::TimeTicks io_timestamp) {
     io_timestamp_ = io_timestamp;
   }
 
  private:
   friend class ResourceDispatcherTest;
+  class IPCResourceLoaderBridge;

[tfarina, 2014/04/05 02:03:46]

John, I burned my head, and this was the way I found to make this work.

I haven't fold IPCResourceLoaderBridge data members and member functions
directly here in ResourceDispatcher because of IPC's ResourceHostMsg_Request
(from content/common/resource_messages.h - which I can't include in
resource_dispatcher.h). Yes, I tried this way initially.

You may help me find a better design for this code and I'm happy to change it
your way.

Thanks in advance for reviewing this.

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

you can forward declare that struct and put it into a scoped_ptr

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

Done.

 
   typedef std::deque<IPC::Message*> MessageQueue;
   struct PendingRequestInfo {
     PendingRequestInfo();
 
     PendingRequestInfo(RequestPeer* peer,
                        ResourceType::Type resource_type,
                        int origin_pid,
                        const GURL& frame_origin,
                        const GURL& request_url);
@@ skipping 101 matching lines @@
   // All pending requests issued to the host
   PendingRequestList pending_requests_;
 
   base::WeakPtrFactory<ResourceDispatcher> weak_factory_;
 
   ResourceDispatcherDelegate* delegate_;
 
   // IO thread timestamp for ongoing IPC message.
   base::TimeTicks io_timestamp_;
 
+  scoped_ptr<IPCResourceLoaderBridge> bridge_;
+
   DISALLOW_COPY_AND_ASSIGN(ResourceDispatcher);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_CHILD_RESOURCE_DISPATCHER_H_