Allow Safe Browsing Saresource Filter to distinguish between different lists.

components/subresource_filter/core/browser/subresource_filter_features.h

Index: components/subresource_filter/core/browser/subresource_filter_features.h
diff --git a/components/subresource_filter/core/browser/subresource_filter_features.h b/components/subresource_filter/core/browser/subresource_filter_features.h
index 0d972a7f30d25b8da35f6e138645afe6f8a111e6..41c8ec999db1c1dde501b5787e661af020537a94 100644
--- a/components/subresource_filter/core/browser/subresource_filter_features.h
+++ b/components/subresource_filter/core/browser/subresource_filter_features.h
@@ -6,6 +6,7 @@
 #define COMPONENTS_SUBRESOURCE_FILTER_SUBRESOURCE_FILTER_FEATURES_H_
 
 #include "base/feature_list.h"
+#include "components/subresource_filter/core/common/activation_list.h"
 #include "components/subresource_filter/core/common/activation_scope.h"
 #include "components/subresource_filter/core/common/activation_state.h"
 
@@ -25,6 +26,10 @@ extern const char kActivationScopeAllSites[];
 extern const char kActivationScopeActivationList[];
 extern const char kActivationScopeNoSites[];
 
+extern const char kActivationListsParameterName[];
+extern const char kActivationListSocialEngAdsIntestitial[];

[engedy, 2016/08/25 21:32:54]

typo: "Interstitial" (missing 'r').  In more places in the enumerator and
strings too. 

Also, for consistency with SB terminology elsewhere, can we just
s/Eng/Engineering/? I know it's long, but it's already long. :)  

[melandory, 2016/08/26 15:06:10]

Done.

+extern const char kActivationListPhishingInterstitial[];
+
 // Returns the maximum degree to which subresource filtering should be activated
 // on any RenderFrame. This will be ActivationState::DISABLED unless the feature
 // is enabled and variation parameters prescribe a higher activation state.
@@ -36,6 +41,12 @@ ActivationState GetMaximumActivationState();
 // parameters prescribe a wider activation scope.
 ActivationScope GetCurrentActivationScope();
 
+// Returns current activation list, based on the values from variation params in
+// the feature |kSafeBrowsingSubresourceFilter|. When the corresponding
+// variation param is empty, returns most conservative
+// ActivationList::SOCIAL_ENG_ADS_INTERSTITAL.
+ActivationList GetCurrentActivationList();

[engedy, 2016/08/25 21:32:54]

I'd suggest being even more conservative here. An empty list should mean none,
and more importantly, a "list containing only future values unknown to this
client" should mean none too.

In the future we will probably want this to return a bitmask. For now, fine to
just have ActivationList::NONE or something along these lines. And return the
widest list for which we find a token in the comma-separated list.

[melandory, 2016/08/26 15:06:10]

Done.

+
 }  // namespace subresource_filter
 
 #endif  // COMPONENTS_SUBRESOURCE_FILTER_SUBRESOURCE_FILTER_FEATURES_H_