Track download request time and always send back the hash.

chrome/browser/download/chrome_download_manager_delegate.cc

 // Copyright (c) 2011 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/chrome_download_manager_delegate.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/callback.h"
 #include "base/file_util.h"
@@ skipping 189 matching lines @@
   crx_installers_[crx_installer.get()] = item->id();
   // The status text and percent complete indicator will change now
   // that we are installing a CRX.  Update observers so that they pick
   // up the change.
   item->UpdateObservers();
   return false;
 }
 
 bool ChromeDownloadManagerDelegate::GenerateFileHash() {
 #if defined(ENABLE_SAFE_BROWSING)
+  SafeBrowsingService* sb_service = g_browser_process->safe_browsing_service();
   return profile_->GetPrefs()->GetBoolean(prefs::kSafeBrowsingEnabled) &&
-      g_browser_process->safe_browsing_service()->DownloadBinHashNeeded();
+      (sb_service->DownloadBinHashNeeded() ||
+       (sb_service->download_protection_service() &&
+        sb_service->download_protection_service()->enabled()));

[Randy Smith (Not in Mondays), 2011/11/18 23:27:17]

Why this change?  Why can't sb_service->DownloadBinHashNeeded() include this
logic?

[noelutz, 2011/11/18 23:30:24]

Good point. Done.

 #else
   return false;
 #endif
 }
 
 void ChromeDownloadManagerDelegate::OnResponseCompleted(DownloadItem* item) {
   // TODO(noelutz): remove this method from the delegate API.
 }
 
 void ChromeDownloadManagerDelegate::AddItemToPersistentStore(
@@ skipping 369 matching lines @@
     int32 download_id, int64 db_handle) {
   // It's not immediately obvious, but HistoryBackend::CreateDownload() can
   // call this function with an invalid |db_handle|. For instance, this can
   // happen when the history database is offline. We cannot have multiple
   // DownloadItems with the same invalid db_handle, so we need to assign a
   // unique |db_handle| here.
   if (db_handle == DownloadItem::kUninitializedHandle)
     db_handle = download_history_->GetNextFakeDbHandle();
   download_manager_->OnItemAddedToPersistentStore(download_id, db_handle);
 }