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

content/content_browser.gypi

 # 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.
 
 {
   'dependencies': [
     '../crypto/crypto.gyp:crypto',
     '../net/net.gyp:net',
     '../net/net.gyp:http_server',
     '../ppapi/ppapi_internal.gyp:ppapi_proxy',
@@ skipping 98 matching lines @@
     'browser/download/base_file.cc',
     'browser/download/base_file.h',
     'browser/download/download_create_info.cc',
     'browser/download/download_create_info.h',
     'browser/download/download_file.cc',
     'browser/download/download_file.h',
     'browser/download/download_file_manager.cc',
     'browser/download/download_file_manager.h',
     'browser/download/download_id.cc',
     'browser/download/download_id.h',
+    'browser/download/download_id_factory.cc',
+    'browser/download/download_id_factory.h',
     'browser/download/download_item.cc',
     'browser/download/download_item.h',
     'browser/download/download_manager.cc',
     'browser/download/download_manager.h',
     'browser/download/download_manager_delegate.h',
     'browser/download/download_persistent_store_info.cc',
     'browser/download/download_persistent_store_info.h',
     'browser/download/download_request_handle.cc',
     'browser/download/download_request_handle.h',
     'browser/download/download_resource_handler.cc',
@@ skipping 550 matching lines @@
         ['exclude', '^browser/renderer_host/render_message_filter_win.cc'],
       ],
     }, {
       'sources/': [
         ['exclude', '^browser/renderer_host/render_widget_host_view_aura.cc'],
         ['exclude', '^browser/renderer_host/render_widget_host_view_aura.h'],
       ],
     }],
   ],
 }