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 26 matching lines @@
                         &DownloadSBClient::CheckDownloadHashOnIOThread,
                         hash));
 }
 
 void DownloadSBClient::CheckDownloadUrlOnIOThread(
     const std::vector<GURL>& url_chain) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
 
   // Will be released in OnDownloadUrlCheckResult.
   AddRef();
   if (sb_service_.get() && !sb_service_->CheckDownloadUrl(url_chain, this)) {

[mattm, 2011/06/23 01:24:25]

Should be checking safe_browsing_enabled_ here.

[Miranda Callahan, 2011/06/23 14:05:26]

Done.

     // Wait for SafeBrowsingService to call back OnDownloadUrlCheckResult.
     return;
   }
   OnDownloadUrlCheckResult(url_chain, SafeBrowsingService::SAFE);
 }
 
 // The callback interface for SafeBrowsingService::Client.
 // Called when the result of checking a download URL is known.
 void DownloadSBClient::OnDownloadUrlCheckResult(
     const std::vector<GURL>& url_chain,
     SafeBrowsingService::UrlCheckResult result) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
   BrowserThread::PostTask(BrowserThread::UI, FROM_HERE,
       NewRunnableMethod(this,
                         &DownloadSBClient::SafeBrowsingCheckUrlDone,
                         result));
   Release();
 }
 
 void DownloadSBClient::CheckDownloadHashOnIOThread(const std::string& hash) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
   // Will be released in OnDownloadUrlCheckResult.
   AddRef();
   if (sb_service_.get() && !sb_service_->CheckDownloadHash(hash, this)) {

[mattm, 2011/06/23 01:24:25]

And here.

[Miranda Callahan, 2011/06/23 14:05:26]

Done.

     // Wait for SafeBrowsingService to call back OnDownloadUrlCheckResult.
     return;
   }
   OnDownloadHashCheckResult(hash, SafeBrowsingService::SAFE);
 }
 
 // The callback interface for SafeBrowsingService::Client.
 // Called when the result of checking a download URL is known.
 void DownloadSBClient::OnDownloadHashCheckResult(
     const std::string& hash, SafeBrowsingService::UrlCheckResult result) {
@@ skipping 52 matching lines @@
   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);
 }