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

content/browser/download/mock_download_manager.h

 // 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.
 
 #ifndef CONTENT_BROWSER_DOWNLOAD_MOCK_DOWNLOAD_MANAGER_H_
 #define CONTENT_BROWSER_DOWNLOAD_MOCK_DOWNLOAD_MANAGER_H_
 #pragma once
 
 #include "content/browser/download/download_manager.h"
 
 class DownloadStatusUpdater;
 class DownloadItem;
 
 class MockDownloadManager : public DownloadManager {
  public:
   explicit MockDownloadManager(DownloadManagerDelegate* delegate,
+                               DownloadIdFactory* id_factory,
                                DownloadStatusUpdater* updater)
-      : DownloadManager(delegate, updater) {
+      : DownloadManager(delegate, id_factory, updater) {
   }
 
   // Override some functions.
   virtual void UpdateHistoryForDownload(DownloadItem*) { }
 };
 
 #endif  // CONTENT_BROWSER_DOWNLOAD_MOCK_DOWNLOAD_MANAGER_H_