Hooked up NetLog to DownloadItem, DownloadFile, and FileStream.

content/browser/download/download_manager_impl.cc

 // Copyright (c) 2012 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_manager_impl.h"
 
 #include <iterator>
 
 #include "base/bind.h"
 #include "base/callback.h"
@@ skipping 109 matching lines @@
   base::hash_map<int64, DownloadItem*>::const_iterator iter_;
   // Allow copy and assign.
 };
 
 }  // namespace
 
 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() {
   DCHECK(!shutdown_needed_);
 }
 
 DownloadId DownloadManagerImpl::GetNextId() {
   return delegate_->GetNextId();
 }
 
@@ skipping 250 matching lines @@
   downloads_.insert(download);
   active_downloads_[download_id] = download;
 }
 
 DownloadItem* DownloadManagerImpl::CreateSavePackageDownloadItem(
     const FilePath& main_file_path,
     const GURL& page_url,
     bool is_otr,
     DownloadItem::Observer* observer) {
   DownloadItem* download = new DownloadItemImpl(
-      this, main_file_path, page_url, is_otr, GetNextId(), NULL);
+      this, main_file_path, page_url, is_otr, GetNextId(), GetNetLog());
 
   download->AddObserver(observer);
 
   DCHECK(!ContainsKey(save_page_downloads_, download->GetId()));
   downloads_.insert(download);
   save_page_downloads_[download->GetId()] = download;
 
   // Will notify the observer in the callback.
   delegate_->AddItemToPersistentStore(download);
 
@@ skipping 484 matching lines @@
 // The history service has retrieved all download entries. 'entries' contains
 // 'DownloadPersistentStoreInfo's in sorted order (by ascending start_time).
 void DownloadManagerImpl::OnPersistentStoreQueryComplete(
     std::vector<DownloadPersistentStoreInfo>* entries) {
   // TODO(rdsmith): Remove this and related logic when
   // http://crbug.com/96627 is fixed.
   largest_db_handle_in_history_ = 0;
 
   for (size_t i = 0; i < entries->size(); ++i) {
     DownloadItem* download = new DownloadItemImpl(
-        this, GetNextId(), entries->at(i), NULL);
+        this, GetNextId(), entries->at(i), GetNetLog());
     CHECK_96627(!ContainsKey(history_downloads_, download->GetDbHandle()));
     downloads_.insert(download);
     history_downloads_[download->GetDbHandle()] = download;
     VLOG(20) << __FUNCTION__ << "()" << i << ">"
              << " download = " << download->DebugString(true);
 
     if (download->GetDbHandle() > largest_db_handle_in_history_)
       largest_db_handle_in_history_ = download->GetDbHandle();
   }
   NotifyModelChanged();
@@ skipping 237 matching lines @@
        it != history_downloads_.end(); ++it) {
     if (it->second->IsComplete() && !it->second->GetOpened())
       ++num_unopened;
   }
   download_stats::RecordOpensOutstanding(num_unopened);
 }
 
 void DownloadManagerImpl::SetFileManager(DownloadFileManager* file_manager) {
   file_manager_ = file_manager;
 }
+
+net::NetLog* DownloadManagerImpl::GetNetLog() {
+  return net_log_;

[Randy Smith (Not in Mondays), 2012/02/07 15:20:39]

I'd argue that there's no point to this routine; it's just cluttering the DMI
interface (admittedly at the private level, so it isn't as painful, but it's
still clutter).  DMI methods are allowed to know about DMI member variables, and
net_log_ is just as understandable as GetNetLog().  More, even, because the
audience knows that there's no magic going on in GetNetLog().

[ahendrickson, 2012/02/07 17:58:38]

Removed.

+}