From 152c9afdc4e5ae197fd98e0fabe52e3365b6b9a9 Mon Sep 17 00:00:00 2001
From: Monica Chew <mmc@mozilla.com>
Date: Fri, 9 Jan 2015 13:25:02 -0800
Subject: [PATCH] Bug 1100024: ClassifyLocal should not lookup in any tables if
 safebrowsing is disabled (r=gcp)

---
 .../url-classifier/nsUrlClassifierDBService.cpp           | 8 +++++---
 .../components/url-classifier/nsUrlClassifierDBService.h  | 3 +++
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/toolkit/components/url-classifier/nsUrlClassifierDBService.cpp b/toolkit/components/url-classifier/nsUrlClassifierDBService.cpp
index 138565223ab6..20448d67a609 100644
--- a/toolkit/components/url-classifier/nsUrlClassifierDBService.cpp
+++ b/toolkit/components/url-classifier/nsUrlClassifierDBService.cpp
@@ -1269,17 +1269,19 @@ nsUrlClassifierDBService::Init()
   return NS_OK;
 }
 
-static void BuildTables(bool aTrackingProtectionEnabled, nsCString &tables)
+void
+nsUrlClassifierDBService::BuildTables(bool aTrackingProtectionEnabled,
+                                      nsCString &tables)
 {
   nsAutoCString malware;
   // LookupURI takes a comma-separated list already.
   Preferences::GetCString(MALWARE_TABLE_PREF, &malware);
-  if (!malware.IsEmpty()) {
+  if (mCheckMalware && !malware.IsEmpty()) {
     tables.Append(malware);
   }
   nsAutoCString phishing;
   Preferences::GetCString(PHISH_TABLE_PREF, &phishing);
-  if (!phishing.IsEmpty()) {
+  if (mCheckPhishing && !phishing.IsEmpty()) {
     tables.Append(',');
     tables.Append(phishing);
   }
diff --git a/toolkit/components/url-classifier/nsUrlClassifierDBService.h b/toolkit/components/url-classifier/nsUrlClassifierDBService.h
index 9089da63baf9..398f72b5f3f4 100644
--- a/toolkit/components/url-classifier/nsUrlClassifierDBService.h
+++ b/toolkit/components/url-classifier/nsUrlClassifierDBService.h
@@ -87,6 +87,9 @@ private:
   // Read everything into mGethashTables and mDisallowCompletionTables
   nsresult ReadTablesFromPrefs();
 
+  // Build a comma-separated list of tables to check
+  void BuildTables(bool trackingProtectionEnabled, nsCString& tables);
+
   nsRefPtr<nsUrlClassifierDBServiceWorker> mWorker;
   nsCOMPtr<nsIUrlClassifierDBServiceWorker> mWorkerProxy;