Remove ResourceDispatcherHost dependency on Chrome's LoginHandler and ExternalProtocolHandler.

content/common/resource_dispatcher.h

 // 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
 
 #ifndef CONTENT_COMMON_RESOURCE_DISPATCHER_H_
 #define CONTENT_COMMON_RESOURCE_DISPATCHER_H_
 #pragma once
 
 #include <deque>
 #include <string>
 
 #include "base/hash_tables.h"
 #include "base/memory/linked_ptr.h"
 #include "base/shared_memory.h"
 #include "base/task.h"
 #include "ipc/ipc_channel.h"
 #include "webkit/glue/resource_loader_bridge.h"
 
+class ResourceDispatcherDelegate;
 struct ResourceResponseHead;
 
 // 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 ResourceDispatcher : public IPC::Channel::Listener {
  public:
-  // Interface that allows observing request events and optionally replacing the
-  // peer.
-  class Observer {
-   public:
-    Observer();
-    virtual ~Observer();
-
-    virtual webkit_glue::ResourceLoaderBridge::Peer* OnRequestComplete(
-        webkit_glue::ResourceLoaderBridge::Peer* current_peer,
-        ResourceType::Type resource_type,
-        const net::URLRequestStatus& status) = 0;
-
-    virtual webkit_glue::ResourceLoaderBridge::Peer* OnReceivedResponse(
-        webkit_glue::ResourceLoaderBridge::Peer* current_peer,
-        const std::string& mime_type,
-        const GURL& url) = 0;
-  };
-
   explicit ResourceDispatcher(IPC::Message::Sender* sender);
   virtual ~ResourceDispatcher();
 
   // IPC::Channel::Listener implementation.
   virtual bool OnMessageReceived(const IPC::Message& message);
 
   // 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(
@@ skipping 12 matching lines @@
   // Cancels a request in the pending_requests_ list.
   void CancelPendingRequest(int routing_id, int request_id);
 
   IPC::Message::Sender* message_sender() const {
     return message_sender_;
   }
 
   // Toggles the is_deferred attribute for the specified request.
   void SetDefersLoading(int request_id, bool value);
 
-  // Takes ownership of the object.
-  void set_observer(Observer* observer) { observer_.reset(observer); }
+  // This does not take ownership of the delegate. It is expected that the
+  // delegate have a longer lifetime than the ResourceDispatcher.
+  void set_delegate(ResourceDispatcherDelegate* delegate) {
+    delegate_ = delegate;
+  }
 
  private:
   friend class ResourceDispatcherTest;
 
   typedef std::deque<IPC::Message*> MessageQueue;
   struct PendingRequestInfo {
     PendingRequestInfo() { }
     PendingRequestInfo(webkit_glue::ResourceLoaderBridge::Peer* peer,
                        ResourceType::Type resource_type,
                        const GURL& request_url)
@@ skipping 69 matching lines @@
   // for use on deferred message queues that are no longer needed.
   static void ReleaseResourcesInMessageQueue(MessageQueue* queue);
 
   IPC::Message::Sender* message_sender_;
 
   // All pending requests issued to the host
   PendingRequestList pending_requests_;
 
   ScopedRunnableMethodFactory<ResourceDispatcher> method_factory_;
 
-  scoped_ptr<Observer> observer_;
+  ResourceDispatcherDelegate* delegate_;
 
   DISALLOW_COPY_AND_ASSIGN(ResourceDispatcher);
 };
 
 #endif  // CONTENT_COMMON_RESOURCE_DISPATCHER_H_