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

content/browser/download/download_id_unittest.cc

Index: content/browser/download/download_id_unittest.cc
===================================================================
--- content/browser/download/download_id_unittest.cc	(revision 108294)
+++ content/browser/download/download_id_unittest.cc	(working copy)
@@ -25,7 +25,7 @@
     // 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());