Hooked up NetLog to DownloadItem, DownloadFile, and FileStream.

content/browser/download/download_file_manager.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_file_manager.h"
 
 #include <set>
 #include <string>
 
 #include "base/bind.h"
@@ skipping 28 matching lines @@
 
 class DownloadFileFactoryImpl
     : public DownloadFileManager::DownloadFileFactory {
  public:
   DownloadFileFactoryImpl() {}
 
   virtual content::DownloadFile* CreateFile(
       DownloadCreateInfo* info,
       const DownloadRequestHandle& request_handle,
       DownloadManager* download_manager,
-      bool calculate_hash) OVERRIDE;
+      bool calculate_hash,
+      const net::BoundNetLog& bound_net_log) OVERRIDE;
 };
 
 DownloadFile* DownloadFileFactoryImpl::CreateFile(
     DownloadCreateInfo* info,
     const DownloadRequestHandle& request_handle,
     DownloadManager* download_manager,
-    bool calculate_hash) {
+    bool calculate_hash,
+    const net::BoundNetLog& bound_net_log) {
   return new DownloadFileImpl(info,
                               new DownloadRequestHandle(request_handle),
-                              download_manager, calculate_hash);
+                              download_manager, calculate_hash,
+                              bound_net_log);
 }
 
 }  // namespace
 
 DownloadFileManager::DownloadFileManager(ResourceDispatcherHost* rdh,
                                          DownloadFileFactory* factory)
     : resource_dispatcher_host_(rdh), download_file_factory_(factory) {
   if (download_file_factory_ == NULL)
     download_file_factory_.reset(new DownloadFileFactoryImpl);
 }
@@ skipping 10 matching lines @@
 }
 
 void DownloadFileManager::OnShutdown() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
   StopUpdateTimer();
   STLDeleteValues(&downloads_);
 }
 
 void DownloadFileManager::CreateDownloadFile(
     DownloadCreateInfo* info, const DownloadRequestHandle& request_handle,
-    DownloadManager* download_manager, bool get_hash) {
+    DownloadManager* download_manager, bool get_hash,
+    const net::BoundNetLog& bound_net_log) {
   DCHECK(info);
   VLOG(20) << __FUNCTION__ << "()" << " info = " << info->DebugString();
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
 
   // Life of |info| ends here. No more references to it after this method.
   scoped_ptr<DownloadCreateInfo> infop(info);
 
   scoped_ptr<DownloadFile> download_file(download_file_factory_->CreateFile(
-      info, request_handle, download_manager, get_hash));
+      info, request_handle, download_manager, get_hash, bound_net_log));
   if (net::OK != download_file->Initialize()) {
     request_handle.CancelRequest();
     return;
   }
 
   DCHECK(GetDownloadFile(info->download_id) == NULL);
   downloads_[info->download_id] = download_file.release();
 
   // The file is now ready, we can un-pause the request and start saving data.
   request_handle.ResumeRequest();
@@ skipping 50 matching lines @@
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   DCHECK(info);
 
   DownloadManager* manager = request_handle.GetDownloadManager();
   if (!manager) {
     request_handle.CancelRequest();
     delete info;
     return;
   }
 
-  manager->CreateDownloadItem(info, request_handle);
+  net::BoundNetLog bound_net_log =

[Randy Smith (Not in Mondays), 2012/02/07 23:19:14]

I'd put a comment somewhere in here about using the same bound_net_log/event
source for the DownloadItem and DownloadFile?

[ahendrickson, 2012/02/07 23:58:54]

Done.

+      manager->CreateDownloadItem(info, request_handle);
   bool hash_needed = manager->GenerateFileHash();
 
   BrowserThread::PostTask(BrowserThread::FILE, FROM_HERE,
       base::Bind(&DownloadFileManager::CreateDownloadFile, this,
                  info, request_handle, make_scoped_refptr(manager),
-                 hash_needed));
+                 hash_needed, bound_net_log));
 }
 
 // We don't forward an update to the UI thread here, since we want to throttle
 // the UI update rate via a periodic timer. If the user has cancelled the
 // download (in the UI thread), we may receive a few more updates before the IO
 // thread gets the cancel message: we just delete the data since the
 // DownloadFile has been deleted.
 void DownloadFileManager::UpdateDownload(
     DownloadId global_id, content::DownloadBuffer* buffer) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
@@ skipping 282 matching lines @@
            << " id = " << global_id
            << " download_file = " << download_file->DebugString();
 
   downloads_.erase(global_id);
 
   delete download_file;
 
   if (downloads_.empty())
     StopUpdateTimer();
 }