| Index: content/browser/download/download_manager_impl.cc
|
| diff --git a/content/browser/download/download_manager_impl.cc b/content/browser/download/download_manager_impl.cc
|
| index b0ca79d2ca28e0d950d7a59ee4a21ade172c0613..ddefba9a4818b75a0dc8869f0a1e7ee2ef1caea0 100644
|
| --- a/content/browser/download/download_manager_impl.cc
|
| +++ b/content/browser/download/download_manager_impl.cc
|
| @@ -114,19 +114,22 @@ namespace content {
|
|
|
| // static
|
| DownloadManager* DownloadManager::Create(
|
| - content::DownloadManagerDelegate* delegate) {
|
| - return new DownloadManagerImpl(delegate);
|
| + content::DownloadManagerDelegate* delegate,
|
| + net::NetLog* net_log) {
|
| + return new DownloadManagerImpl(delegate, net_log);
|
| }
|
|
|
| } // namespace content
|
|
|
| DownloadManagerImpl::DownloadManagerImpl(
|
| - content::DownloadManagerDelegate* delegate)
|
| + content::DownloadManagerDelegate* delegate,
|
| + net::NetLog* net_log)
|
| : shutdown_needed_(false),
|
| browser_context_(NULL),
|
| file_manager_(NULL),
|
| delegate_(delegate),
|
| - largest_db_handle_in_history_(DownloadItem::kUninitializedHandle) {
|
| + largest_db_handle_in_history_(DownloadItem::kUninitializedHandle),
|
| + net_log_(net_log) {
|
| }
|
|
|
| DownloadManagerImpl::~DownloadManagerImpl() {
|
| @@ -396,8 +399,10 @@ DownloadItem* DownloadManagerImpl::CreateSavePackageDownloadItem(
|
| const GURL& page_url,
|
| bool is_otr,
|
| DownloadItem::Observer* observer) {
|
| + net::BoundNetLog bound_net_log =
|
| + net::BoundNetLog::Make(GetNetLog(), net::NetLog::SOURCE_DOWNLOAD);
|
| DownloadItem* download = new DownloadItemImpl(
|
| - this, main_file_path, page_url, is_otr, GetNextId(), net::BoundNetLog());
|
| + this, main_file_path, page_url, is_otr, GetNextId(), bound_net_log);
|
|
|
| download->AddObserver(observer);
|
|
|
| @@ -900,8 +905,10 @@ void DownloadManagerImpl::OnPersistentStoreQueryComplete(
|
| largest_db_handle_in_history_ = 0;
|
|
|
| for (size_t i = 0; i < entries->size(); ++i) {
|
| + net::BoundNetLog bound_net_log =
|
| + net::BoundNetLog::Make(GetNetLog(), net::NetLog::SOURCE_DOWNLOAD);
|
| DownloadItem* download = new DownloadItemImpl(
|
| - this, GetNextId(), entries->at(i), net::BoundNetLog());
|
| + this, GetNextId(), entries->at(i), bound_net_log);
|
| CHECK_96627(!ContainsKey(history_downloads_, download->GetDbHandle()));
|
| downloads_.insert(download);
|
| history_downloads_[download->GetDbHandle()] = download;
|
| @@ -1159,3 +1166,7 @@ void DownloadManagerImpl::DownloadOpened(DownloadItem* download) {
|
| void DownloadManagerImpl::SetFileManager(DownloadFileManager* file_manager) {
|
| file_manager_ = file_manager;
|
| }
|
| +
|
| +net::NetLog* DownloadManagerImpl::GetNetLog() {
|
| + return net_log_;
|
| +}
|
|
|