Merge 8401001 r107836 into branch 912: Fix history importing by delaying DownloadManager creation.

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/bind.h"
 #include "base/logging.h"
 #include "base/metrics/histogram.h"
 #include "base/string_util.h"
 #include "content/browser/browser_thread.h"
 #include "content/browser/content_browser_client.h"
+#include "content/browser/download/download_id_factory.h"
 #include "content/browser/download/download_resource_handler.h"
 #include "content/browser/plugin_service.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/browser/resource_context.h"
 #include "content/common/resource_response.h"
 #include "net/base/io_buffer.h"
 #include "net/base/mime_sniffer.h"
@@ skipping 285 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);
 
-    DownloadId dl_id = info->context()->next_download_id_thunk().Run();
+    DownloadId dl_id = info->context()->download_id_factory()->GetNextId();
 
     scoped_refptr<ResourceHandler> handler(
       new DownloadResourceHandler(host_,
                                   info->child_id(),
                                   info->route_id(),
                                   info->request_id(),
                                   request_->url(),
                                   dl_id,
                                   host_->download_file_manager(),
                                   request_,
@@ skipping 135 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);
 }