Merge 83950 - Safebrowsing download UMA results shouldn't be set when safebrowsing is disabled.

BUG=80620
TEST=see bug

Review URL: http://codereview.chromium.org/6901145

TBR=mattm@chromium.org
Review URL: http://codereview.chromium.org/6935015

git-svn-id: svn://svn.chromium.org/chrome/branches/742/src@84173 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 21 insertions, 12 deletions

diff --git a/chrome/browser/download/download_safe_browsing_client.cc b/chrome/browser/download/download_safe_browsing_client.cc
index 1512f1d..3e0577c 100644
--- a/chrome/browser/download/download_safe_browsing_client.cc
+++ b/chrome/browser/download/download_safe_browsing_client.cc
@@ -51,7 +51,6 @@ void DownloadSBClient::CheckDownloadUrl(DownloadCreateInfo* info,
       NewRunnableMethod(this,
                         &DownloadSBClient::CheckDownloadUrlOnIOThread,
                         info->url_chain));
-  UpdateDownloadCheckStats(DOWNLOAD_URL_CHECKS_TOTAL);
 }
 
 void DownloadSBClient::CheckDownloadHash(const std::string& hash,
@@ -68,7 +67,6 @@ void DownloadSBClient::CheckDownloadHash(const std::string& hash,
       NewRunnableMethod(this,
                         &DownloadSBClient::CheckDownloadHashOnIOThread,
                         hash));
-  UpdateDownloadCheckStats(DOWNLOAD_HASH_CHECKS_TOTAL);
 }
 
 void DownloadSBClient::CheckDownloadUrlOnIOThread(
@@ -128,11 +126,14 @@ void DownloadSBClient::SafeBrowsingCheckUrlDone(
   bool is_dangerous = result != SafeBrowsingService::SAFE;
   url_done_callback_->Run(info_, is_dangerous);
 
-  UMA_HISTOGRAM_TIMES("SB2.DownloadUrlCheckDuration",
-                      base::TimeTicks::Now() - start_time_);
-  if (is_dangerous) {
-    UpdateDownloadCheckStats(DOWNLOAD_URL_CHECKS_MALWARE);
-    ReportMalware(result);
+  if (sb_service_.get() && sb_service_->download_protection_enabled()) {
+    UMA_HISTOGRAM_TIMES("SB2.DownloadUrlCheckDuration",
+                        base::TimeTicks::Now() - start_time_);
+    UpdateDownloadCheckStats(DOWNLOAD_URL_CHECKS_TOTAL);
+    if (is_dangerous) {
+      UpdateDownloadCheckStats(DOWNLOAD_URL_CHECKS_MALWARE);
+      ReportMalware(result);
+    }
   }
 }
 
@@ -143,11 +144,15 @@ void DownloadSBClient::SafeBrowsingCheckHashDone(
 
   bool is_dangerous = result != SafeBrowsingService::SAFE;
   hash_done_callback_->Run(download_id_, is_dangerous);
-  UMA_HISTOGRAM_TIMES("SB2.DownloadHashCheckDuration",
-                      base::TimeTicks::Now() - start_time_);
-  if (is_dangerous) {
-    UpdateDownloadCheckStats(DOWNLOAD_HASH_CHECKS_MALWARE);
-    ReportMalware(result);
+
+  if (sb_service_.get() && sb_service_->download_protection_enabled()) {
+    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);
+    }
   }
 }
 
diff --git a/chrome/browser/safe_browsing/safe_browsing_service.h b/chrome/browser/safe_browsing/safe_browsing_service.h
index c06359c..85a7f9fe 100644
--- a/chrome/browser/safe_browsing/safe_browsing_service.h
+++ b/chrome/browser/safe_browsing/safe_browsing_service.h
@@ -219,6 +219,10 @@ class SafeBrowsingService
 
   bool enabled() const { return enabled_; }
 
+  bool download_protection_enabled() const {
+    return enabled_ && enable_download_protection_;
+  }
+
   // Preference handling.
   static void RegisterPrefs(PrefService* prefs);