Remove ResourceDispatcherHost dependency on Chrome's LoginHandler and ExternalProtocolHandler.

content/common/resource_dispatcher.cc

 // 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
 
 #include "content/common/resource_dispatcher.h"
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/file_path.h"
 #include "base/message_loop.h"
 #include "base/shared_memory.h"
 #include "base/string_util.h"
+#include "content/common/resource_dispatcher_delegate.h"
 #include "content/common/resource_messages.h"
 #include "content/common/resource_response.h"
 #include "net/base/net_errors.h"
 #include "net/base/net_util.h"
 #include "net/base/upload_data.h"
 #include "net/http/http_response_headers.h"
 #include "webkit/glue/resource_type.h"
 
 // Each resource request is assigned an ID scoped to this process.
 static int MakeRequestID() {
@@ skipping 193 matching lines @@
   response->load_timing = result.load_timing;
   response->devtools_info = result.devtools_info;
   response->data.swap(result.data);
   response->download_file_path = result.download_file_path;
 }
 
 }  // namespace webkit_glue
 
 // ResourceDispatcher ---------------------------------------------------------
 
-ResourceDispatcher::Observer::Observer() {
-}
-
-ResourceDispatcher::Observer::~Observer() {
-}
-
 ResourceDispatcher::ResourceDispatcher(IPC::Message::Sender* sender)
     : message_sender_(sender),
-      ALLOW_THIS_IN_INITIALIZER_LIST(method_factory_(this)) {
+      ALLOW_THIS_IN_INITIALIZER_LIST(method_factory_(this)),
+      delegate_(NULL) {
 }
 
 ResourceDispatcher::~ResourceDispatcher() {
 }
 
 // ResourceDispatcher implementation ------------------------------------------
 
 bool ResourceDispatcher::OnMessageReceived(const IPC::Message& message) {
   if (!IsResourceDispatcherMessage(message)) {
     return false;
@@ skipping 59 matching lines @@
   message_sender()->Send(
       new ResourceHostMsg_UploadProgress_ACK(message.routing_id(), request_id));
 }
 
 void ResourceDispatcher::OnReceivedResponse(
     int request_id, const ResourceResponseHead& response_head) {
   PendingRequestInfo* request_info = GetPendingRequestInfo(request_id);
   if (!request_info)
     return;
 
-  if (observer_.get()) {
+  if (delegate_) {
     webkit_glue::ResourceLoaderBridge::Peer* new_peer =
-        observer_->OnReceivedResponse(
+        delegate_->OnReceivedResponse(
             request_info->peer, response_head.mime_type, request_info->url);
     if (new_peer)
       request_info->peer = new_peer;
   }
 
   request_info->peer->OnReceivedResponse(response_head);
 }
 
 void ResourceDispatcher::OnReceivedCachedMetadata(
       int request_id, const std::vector<char>& data) {
@@ skipping 85 matching lines @@
 void ResourceDispatcher::OnRequestComplete(int request_id,
                                            const net::URLRequestStatus& status,
                                            const std::string& security_info,
                                            const base::Time& completion_time) {
   PendingRequestInfo* request_info = GetPendingRequestInfo(request_id);
   if (!request_info)
     return;
 
   webkit_glue::ResourceLoaderBridge::Peer* peer = request_info->peer;
 
-  if (observer_.get()) {
+  if (delegate_) {
     webkit_glue::ResourceLoaderBridge::Peer* new_peer =
-        observer_->OnRequestComplete(
+        delegate_->OnRequestComplete(
             request_info->peer, request_info->resource_type, status);
     if (new_peer)
       request_info->peer = new_peer;
   }
 
   // The request ID will be removed from our pending list in the destructor.
   // Normally, dispatching this message causes the reference-counted request to
   // die immediately.
   peer->OnCompletedRequest(status, security_info, completion_time);
 }
@@ skipping 149 matching lines @@
 
 // static
 void ResourceDispatcher::ReleaseResourcesInMessageQueue(MessageQueue* queue) {
   while (!queue->empty()) {
     IPC::Message* message = queue->front();
     ReleaseResourcesInDataMessage(*message);
     queue->pop_front();
     delete message;
   }
 }