Include high-fidelity metadata about a download in incident reports.

chrome/browser/safe_browsing/safe_browsing_service.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 "chrome/browser/safe_browsing/safe_browsing_service.h"
 
 #include <vector>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
@@ skipping 262 matching lines @@
   STLDeleteValues(&prefs_map_);
 
   // Remove Profile creation/destruction observers.
   prefs_registrar_.RemoveAll();
 
   Stop(true);
   // The IO thread is going away, so make sure the ClientSideDetectionService
   // dtor executes now since it may call the dtor of URLFetcher which relies
   // on it.
   csd_service_.reset();
+  incident_service_.reset();
   download_service_.reset();
-  incident_service_.reset();
 
   url_request_context_getter_ = NULL;
   BrowserThread::PostNonNestableTask(
       BrowserThread::IO, FROM_HERE,
       base::Bind(&SafeBrowsingService::DestroyURLRequestContextOnIOThread,
                  this));
 }
 
 // Binhash verification is only enabled for UMA users for now.
 bool SafeBrowsingService::DownloadBinHashNeeded() const {
@@ skipping 45 matching lines @@
 }
 
 void SafeBrowsingService::RegisterDelayedAnalysisCallback(
     const safe_browsing::DelayedAnalysisCallback& callback) {
 #if defined(FULL_SAFE_BROWSING)
   if (incident_service_)
     incident_service_->RegisterDelayedAnalysisCallback(callback);
 #endif
 }
 
+void SafeBrowsingService::AddDownloadManager(
+    content::DownloadManager* download_manager) {
+#if defined(FULL_SAFE_BROWSING)
+  if (incident_service_)
+    incident_service_->AddDownloadManager(download_manager);
+#endif
+}
+
 SafeBrowsingUIManager* SafeBrowsingService::CreateUIManager() {
   return new SafeBrowsingUIManager(this);
 }
 
 SafeBrowsingDatabaseManager* SafeBrowsingService::CreateDatabaseManager() {
 #if defined(FULL_SAFE_BROWSING)
   return new SafeBrowsingDatabaseManager(this);
 #else
   return NULL;
 #endif
@@ skipping 197 matching lines @@
   else
     Stop(false);
 
 #if defined(FULL_SAFE_BROWSING)
   if (csd_service_)
     csd_service_->SetEnabledAndRefreshState(enable);
   if (download_service_)
     download_service_->SetEnabled(enable);
 #endif
 }