Fix history importing by delaying DownloadManager creation.

content/browser/download/download_id_unittest.cc

Index: content/browser/download/download_id_unittest.cc
diff --git a/content/browser/download/download_id_unittest.cc b/content/browser/download/download_id_unittest.cc
index 39d9f3b4e61643af5d9e15aa5396373b6930c18d..92d949d86c6a946bb0b112fe4b01f16ed0213846 100644
--- a/content/browser/download/download_id_unittest.cc
+++ b/content/browser/download/download_id_unittest.cc
@@ -9,8 +9,8 @@
 #include <set>
 #include <vector>
 
-#include "content/browser/download/mock_download_manager_delegate.h"
 #include "content/browser/download/mock_download_manager.h"
+#include "content/browser/download/mock_download_manager_delegate.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 class DownloadIdTest : public testing::Test {
@@ -25,7 +25,7 @@ class DownloadIdTest : public testing::Test {
     // Create the download managers.
     for (i = 0; i < num_managers_; ++i) {
       managers[i] =
-          new MockDownloadManager(download_manager_delegate_.get(), NULL);
+          new MockDownloadManager(download_manager_delegate_.get(), NULL, NULL);
     }
     // Sort by pointer value.
     std::sort(managers.begin(), managers.end());