Bug 1366920 - SafeBrowinsg V4 only in 56. r=francois

MozReview-Commit-ID: KWhPC7YWzAh

toolkit/components/url-classifier/nsUrlClassifierDBService.cpp

@@ -102,11 +102,6 @@ LazyLogModule gUrlClassifierDbServiceLog("UrlClassifierDbService");
 // 30 minutes as the maximum negative cache duration.
 #define MAXIMUM_NEGATIVE_CACHE_DURATION_SEC (30 * 60 * 1000)
 
-// TODO: The following two prefs are to be removed after we
-//       roll out full v4 hash completion. See Bug 1331534.
-#define TAKE_V4_COMPLETION_RESULT_PREF    "browser.safebrowsing.temporary.take_v4_completion_result"
-#define TAKE_V4_COMPLETION_RESULT_DEFAULT false
-
 class nsUrlClassifierDBServiceWorker;
 
 // Singleton instance.
@@ -1290,14 +1285,6 @@ nsUrlClassifierLookupCallback::HandleResults()
       continue;
     }
 
-    if (StringEndsWith(result.mTableName, NS_LITERAL_CSTRING("-proto")) &&
-        !Preferences::GetBool(TAKE_V4_COMPLETION_RESULT_PREF,
-                              TAKE_V4_COMPLETION_RESULT_DEFAULT)) {
-      // Bug 1331534 - We temporarily ignore hash completion result
-      // for v4 tables.
-      continue;
-    }
-
     LOG(("Confirmed result %s from table %s",
          result.PartialHashHex().get(), result.mTableName.get()));