Factor out dependncy on download throttling from core download code.

content/browser/renderer_host/buffered_resource_handler.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.
 
 #include "content/browser/renderer_host/buffered_resource_handler.h"
 
 #include <vector>
 
 #include "base/logging.h"
 #include "base/metrics/histogram.h"
 #include "base/string_util.h"
-#include "chrome/browser/renderer_host/download_throttling_resource_handler.h"
 #include "content/browser/browser_thread.h"
 #include "content/browser/content_browser_client.h"
+#include "content/browser/download/download_resource_handler.h"
 #include "content/browser/renderer_host/resource_dispatcher_host.h"
 #include "content/browser/renderer_host/resource_dispatcher_host_delegate.h"
 #include "content/browser/renderer_host/resource_dispatcher_host_request_info.h"
 #include "content/browser/renderer_host/x509_user_cert_resource_handler.h"
 #include "content/common/resource_response.h"
 #include "net/base/io_buffer.h"
 #include "net/base/mime_sniffer.h"
 #include "net/base/mime_util.h"
 #include "net/base/net_errors.h"
 #include "net/http/http_response_headers.h"
@@ skipping 276 matching lines @@
       // know how to display the content.  We follow Firefox here and show our
       // own error page instead of triggering a download.
       // TODO(abarth): We should abstract the response_code test, but this kind
       //               of check is scattered throughout our codebase.
       request_->SimulateError(net::ERR_FILE_NOT_FOUND);
       return false;
     }
 
     info->set_is_download(true);
 
-    DownloadThrottlingResourceHandler* download_handler =
-        new DownloadThrottlingResourceHandler(host_,
-                                              request_,
-                                              request_->url(),
-                                              info->child_id(),
-                                              info->route_id(),
-                                              request_id,
-                                              in_complete);
-    UseAlternateResourceHandler(request_id, download_handler);
+    scoped_refptr<ResourceHandler> handler(

[Paweł Hajdan Jr., 2011/08/16 17:14:08]

This is a bit suspicious to me: previously this wasn't scoped_refptr, so we
might be destroying the object too early now. But I don't really know this code.

[jam, 2011/08/16 18:18:20]

this is fine as well, we use this pattern in other places

+      new DownloadResourceHandler(host_,
+                                  info->child_id(),
+                                  info->route_id(),
+                                  info->request_id(),
+                                  request_->url(),
+                                  host_->download_file_manager(),
+                                  request_,
+                                  false,
+                                  DownloadSaveInfo()));
+
+    if (host_->delegate()) {
+      handler = host_->delegate()->DownloadStarting(
+          handler, *info->context(), request_, info->child_id(),
+          info->route_id(), info->request_id(), false, in_complete);
+    }
+
+    UseAlternateResourceHandler(request_id, handler);
   }
   return real_handler_->OnResponseStarted(request_id, response_);
 }
 
 bool BufferedResourceHandler::ShouldWaitForPlugins() {
   bool need_plugin_list;
   if (!ShouldDownload(&need_plugin_list) || !need_plugin_list)
     return false;
 
   // We don't want to keep buffering as our buffer will fill up.
@@ skipping 122 matching lines @@
   wait_for_plugins_ = false;
   if (!request_)
     return;
 
   ResourceDispatcherHostRequestInfo* info =
       ResourceDispatcherHost::InfoForRequest(request_);
   host_->PauseRequest(info->child_id(), info->request_id(), false);
   if (!CompleteResponseStarted(info->request_id(), false))
     host_->CancelRequest(info->child_id(), info->request_id(), false);
 }