Bug 1522265 - Moving malware, phishing and blocked URIs to features - part 2 - factory updated, r=dimi

netwerk/url-classifier/UrlClassifierFeatureFactory.cpp

@@ -79,6 +79,11 @@ namespace net {
   aFeatures.AppendElements(flashFeatures);
 }
 
+/* static */ void UrlClassifierFeatureFactory::GetFeaturesNoChannel(
+    nsTArray<RefPtr<nsIUrlClassifierFeature>>& aFeatures) {
+  UrlClassifierFeatureNoChannel::MaybeCreate(aFeatures);
+}
+
 /* static */
 nsIUrlClassifierFeature*
 UrlClassifierFeatureFactory::GetFeatureLoginReputation() {

netwerk/url-classifier/UrlClassifierFeatureFactory.h

@@ -24,6 +24,9 @@ class UrlClassifierFeatureFactory final {
       nsIChannel* aChannel,
       nsTArray<nsCOMPtr<nsIUrlClassifierFeature>>& aFeatures);
 
+  static void GetFeaturesNoChannel(
+      nsTArray<RefPtr<nsIUrlClassifierFeature>>& aFeatures);
+
   static nsIUrlClassifierFeature* GetFeatureLoginReputation();
 
   static already_AddRefed<nsIUrlClassifierFeature> GetFeatureByName(

netwerk/url-classifier/UrlClassifierFeatureNoChannel.cpp

@@ -71,6 +71,18 @@ UrlClassifierFeatureNoChannel::UrlClassifierFeatureNoChannel(
   }
 }
 
+/* static */ void UrlClassifierFeatureNoChannel::MaybeCreate(
+    nsTArray<RefPtr<nsIUrlClassifierFeature>>& aFeatures) {
+  MaybeInitialize();
+
+  for (const NoChannelFeature& feature : sNoChannelFeaturesMap) {
+    if (feature.mPref()) {
+      MOZ_ASSERT(feature.mFeature);
+      aFeatures.AppendElement(feature.mFeature);
+    }
+  }
+}
+
 /* static */ already_AddRefed<nsIUrlClassifierFeature>
 UrlClassifierFeatureNoChannel::GetIfNameMatches(const nsACString& aName) {
   MaybeInitialize();

netwerk/url-classifier/UrlClassifierFeatureNoChannel.h

@@ -20,6 +20,9 @@ class UrlClassifierFeatureNoChannel final : public UrlClassifierFeatureBase {
 
   static void MaybeShutdown();
 
+  static void MaybeCreate(
+      nsTArray<RefPtr<nsIUrlClassifierFeature>>& aFeatures);
+
   static already_AddRefed<nsIUrlClassifierFeature> GetIfNameMatches(
       const nsACString& aName);