Make safe browsing work in a multi-profile environment.

chrome/browser/download/download_safe_browsing_client.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/download_safe_browsing_client.h"
 
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/metrics/histogram.h"
 #include "base/metrics/stats_counters.h"
 #include "base/string_number_conversions.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/download/download_create_info.h"
 #include "chrome/browser/download/download_manager.h"
 #include "chrome/browser/safe_browsing/safe_browsing_util.h"
 #include "chrome/common/chrome_switches.h"
 #include "content/browser/browser_thread.h"
 #include "content/browser/renderer_host/resource_dispatcher_host.h"
 
 // TODO(lzheng): Get rid of the AddRef and Release after
 // SafeBrowsingService::Client is changed to RefCountedThreadSafe<>.
 
 DownloadSBClient::DownloadSBClient(int32 download_id,
                                    const std::vector<GURL>& url_chain,
-                                   const GURL& referrer_url)
+                                   const GURL& referrer_url,
+                                   bool safe_browsing_enabled)
   : download_id_(download_id),
     url_chain_(url_chain),
-    referrer_url_(referrer_url) {
+    referrer_url_(referrer_url),
+    safe_browsing_enabled_(safe_browsing_enabled) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   DCHECK(!url_chain.empty());
   ResourceDispatcherHost* rdh = g_browser_process->resource_dispatcher_host();
   if (rdh)
     sb_service_ = g_browser_process->safe_browsing_service();
 }
 
 DownloadSBClient::~DownloadSBClient() {}
 
 void DownloadSBClient::CheckDownloadUrl(UrlDoneCallback* callback) {
@@ skipping 70 matching lines @@
     const std::string& hash, SafeBrowsingService::UrlCheckResult result) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
   BrowserThread::PostTask(BrowserThread::UI, FROM_HERE,
       NewRunnableMethod(this,
                         &DownloadSBClient::SafeBrowsingCheckHashDone,
                         result,
                         hash));
   Release();
 }
 
+// pass in knowledge of can we report stats
 void DownloadSBClient::SafeBrowsingCheckUrlDone(
     SafeBrowsingService::UrlCheckResult result) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   DVLOG(1) << "SafeBrowsingCheckUrlDone with result: " << result;
 
   bool is_dangerous = result != SafeBrowsingService::SAFE;
   url_done_callback_->Run(download_id_, is_dangerous);
 
   if (sb_service_.get() && sb_service_->download_protection_enabled()) {
     UMA_HISTOGRAM_TIMES("SB2.DownloadUrlCheckDuration",
@@ skipping 19 matching lines @@
     UMA_HISTOGRAM_TIMES("SB2.DownloadHashCheckDuration",
                         base::TimeTicks::Now() - start_time_);
     UpdateDownloadCheckStats(DOWNLOAD_HASH_CHECKS_TOTAL);
     if (is_dangerous) {
       UpdateDownloadCheckStats(DOWNLOAD_HASH_CHECKS_MALWARE);
       ReportMalware(result, hash);
     }
   }
 }
 
+
 void DownloadSBClient::ReportMalware(
     SafeBrowsingService::UrlCheckResult result,
     const std::string& hash) {
   std::string post_data;
   if (!hash.empty())
     post_data += base::HexEncode(hash.data(), hash.size()) + "\n";
   for (size_t i = 0; i < url_chain_.size(); ++i)
     post_data += url_chain_[i].spec() + "\n";
 
   sb_service_->ReportSafeBrowsingHit(url_chain_.back(),  // malicious_url
                                      url_chain_.front(), // page_url
                                      referrer_url_,
                                      true,  // is_subresource
                                      result,
-                                     post_data);
+                                     post_data,
+                                     safe_browsing_enabled_);
 }
 
 void DownloadSBClient::UpdateDownloadCheckStats(SBStatsType stat_type) {
   UMA_HISTOGRAM_ENUMERATION("SB2.DownloadChecks",
                             stat_type,
                             DOWNLOAD_CHECKS_MAX);
 }