Fix history importing by delaying DownloadManager creation.

content/browser/download/download_id_unittest.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/download/download_id.h"
 
 #include <algorithm>
 #include <map>
 #include <set>
 #include <vector>
 
+#include "content/browser/download/mock_download_manager.h"
 #include "content/browser/download/mock_download_manager_delegate.h"
-#include "content/browser/download/mock_download_manager.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 class DownloadIdTest : public testing::Test {
  public:
   DownloadIdTest()
       : download_manager_delegate_(new MockDownloadManagerDelegate),
         ui_thread_(BrowserThread::UI, &message_loop_) {
     num_managers_ = ARRAYSIZE_UNSAFE(download_managers_);
     std::vector<MockDownloadManager*> managers;
     managers.resize(num_managers_);
     size_t i;
     // 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());
     // Assign to |download_managers_|.
     for (i = 0; i < num_managers_; ++i) {
       download_managers_[i] = managers[i];
       managers[i] = NULL;
     }
   }
 
@@ skipping 101 matching lines @@
   EXPECT_EQ(kLocalId[2], map[id3]);
   last = map.end();
   EXPECT_FALSE(last == map.find(id1));
   EXPECT_FALSE(last == map.find(id2));
   EXPECT_FALSE(last == map.find(id3));
 
   EXPECT_FALSE(id1 == id2);
   EXPECT_LT(id1, id2);
 }