Fix history importing by delaying DownloadManager creation.

content/browser/renderer_host/buffered_resource_handler.cc

Index: content/browser/renderer_host/buffered_resource_handler.cc
diff --git a/content/browser/renderer_host/buffered_resource_handler.cc b/content/browser/renderer_host/buffered_resource_handler.cc
index 590f9b32a1b66f0c057dc9668362fe0b1c626fc4..fee6908444f9c238da1f199e8ab6339e5ac7ea75 100644
--- a/content/browser/renderer_host/buffered_resource_handler.cc
+++ b/content/browser/renderer_host/buffered_resource_handler.cc
@@ -12,6 +12,7 @@
 #include "base/string_util.h"
 #include "content/browser/browser_thread.h"
 #include "content/browser/download/download_resource_handler.h"
+#include "content/browser/download/download_id_factory.h"

[Miranda Callahan, 2011/10/27 17:00:19]

nitalpha

[benjhayden, 2011/10/27 19:04:41]

Done.

 #include "content/browser/plugin_service.h"
 #include "content/browser/renderer_host/resource_dispatcher_host.h"
 #include "content/browser/renderer_host/resource_dispatcher_host_request_info.h"
@@ -317,7 +318,7 @@ bool BufferedResourceHandler::CompleteResponseStarted(int request_id,
 
     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_,