[subresource_filter] Swap ALLOW and BLOCK meanings in the content setting

chrome/browser/subresource_filter/chrome_subresource_filter_client.h

Index: chrome/browser/subresource_filter/chrome_subresource_filter_client.h
diff --git a/chrome/browser/subresource_filter/chrome_subresource_filter_client.h b/chrome/browser/subresource_filter/chrome_subresource_filter_client.h
index 8e47d342c9d39f5596ad3f03c25ccf30e1a9b935..640b4bf8634f484071465a466a5a24e405c2b56c 100644
--- a/chrome/browser/subresource_filter/chrome_subresource_filter_client.h
+++ b/chrome/browser/subresource_filter/chrome_subresource_filter_client.h
@@ -44,16 +44,16 @@ enum SubresourceFilterAction {
   // Content settings:
   //
   // Content setting updated automatically via the standard UI.
-  kActionContentSettingsBlockedFromUI,
+  kActionContentSettingsAllowedFromUI,
 
   // Content settings which target specific origins (e.g. no wildcards). These
   // updates do not include updates from the main UI.
-  kActionContentSettingsAllowed,
   kActionContentSettingsBlocked,
+  kActionContentSettingsAllowed,
 
   // Global settings.
-  kActionContentSettingsAllowedGlobal,
   kActionContentSettingsBlockedGlobal,
+  kActionContentSettingsAllowedGlobal,
 
   // A wildcard update. The current content settings API makes this a bit
   // difficult to see whether it is Block or Allow. This should not be a huge
@@ -71,7 +71,7 @@ enum SubresourceFilterAction {
   // suppressing the UI. Potentially indicates that the smart UI is too
   // aggressive if this happens frequently. This is a reported alongside
   // kActionContentSettingsBlocked if the UI is currently in suppressed mode.
-  kActionContentSettingsBlockedWhileUISuppressed,
+  kActionContentSettingsAllowedWhileUISuppressed,

[engedy, 2017/05/11 10:39:37]

I am glad we are cleaning this up, it took some serious time before I applied
that right number of negations here. :-)

[Charlie Harrison, 2017/05/11 14:05:44]

:)

 
   kActionLastEntry
 };