Hooked up NetLog to DownloadItem, DownloadFile, and FileStream.

chrome/browser/download/download_service.cc

-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// 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 "chrome/browser/download/download_service.h"
 
 #include "base/callback.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/download/chrome_download_manager_delegate.h"
 #include "chrome/browser/download/download_service_factory.h"
+#include "chrome/browser/net/chrome_net_log.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "content/public/browser/download_manager.h"
 
 using content::DownloadManager;
 
 DownloadService::DownloadService(Profile* profile)
     : download_manager_created_(false),
       profile_(profile) {
 }
 
 DownloadService::~DownloadService() {}
 
 void DownloadService::OnManagerCreated(
     const DownloadService::OnManagerCreatedCallback& cb) {
   if (download_manager_created_) {
     cb.Run(manager_.get());
   } else {
     on_manager_created_callbacks_.push_back(cb);
   }
 }
 
 DownloadManager* DownloadService::GetDownloadManager() {
   if (!download_manager_created_) {
     // In case the delegate has already been set by
     // SetDownloadManagerDelegateForTesting.
     if (!manager_delegate_.get())
       manager_delegate_ = new ChromeDownloadManagerDelegate(profile_);
     manager_ = DownloadManager::Create(
-        manager_delegate_.get(), g_browser_process->download_status_updater());
+        manager_delegate_.get(),
+        g_browser_process->download_status_updater(),
+        g_browser_process->net_log());

[Randy Smith (Not in Mondays), 2012/02/03 19:36:41]

Remind me: Is there a global from which we can grab this at the content level? 
I have some vague memory of your telling me that there was, and I'd sorta rather
do that then mess up the DownloadManager constructor.

[ahendrickson, 2012/02/05 05:06:53]

There is:

content::GetContentClient()->browser()->GetNetLog()

If you feel strongly about this I will change DownloadManagerImpl to use this
instead of having a parameter passed into the constructor.

[Randy Smith (Not in Mondays), 2012/02/06 00:37:49]

I'm torn--I can see arguments in both directions.  It really doesn't feel like
the NetLog should be part of the download manager structure, and I don't think
the NetLog is something we're likely to want to mock.  And fewer arguments to
routines, especially constructors, and especially when the arguments don't have
to do with the purpose of the routine, are bad.  What are the arguments against?
 Globals are generally bad; anything else?

     manager_->Init(profile_);
     manager_delegate_->SetDownloadManager(manager_);
     download_manager_created_ = true;
     for (std::vector<OnManagerCreatedCallback>::iterator cb
          = on_manager_created_callbacks_.begin();
          cb != on_manager_created_callbacks_.end(); ++cb) {
       cb->Run(manager_.get());
     }
     on_manager_created_callbacks_.clear();
   }
@@ skipping 45 matching lines @@
     // Resetting here will guarantee that any attempts to get the
     // DownloadManager after shutdown will return null.
     //
     // TODO(rdsmith): Figure out how to guarantee when the last reference
     // will be released and make DownloadManager not RefCountedThreadSafe<>.
     manager_.release();
   }
   if (manager_delegate_.get())
     manager_delegate_.release();
 }