Update FilteringResult UMA to include whitelist information.

chrome/browser/supervised_user/supervised_user_resource_throttle.cc

Index: chrome/browser/supervised_user/supervised_user_resource_throttle.cc
diff --git a/chrome/browser/supervised_user/supervised_user_resource_throttle.cc b/chrome/browser/supervised_user/supervised_user_resource_throttle.cc
index 01c24781741ef7f49b20830da7b33d0a45548b3d..65025ff7a9adb86cd8ac4aaffededc3d70842ead 100644
--- a/chrome/browser/supervised_user/supervised_user_resource_throttle.cc
+++ b/chrome/browser/supervised_user/supervised_user_resource_throttle.cc
@@ -30,14 +30,15 @@ enum {
   FILTERING_BEHAVIOR_BLOCK_SAFESITES,
   FILTERING_BEHAVIOR_BLOCK_MANUAL,
   FILTERING_BEHAVIOR_BLOCK_DEFAULT,
-  FILTERING_BEHAVIOR_MAX = FILTERING_BEHAVIOR_BLOCK_DEFAULT
+  FILTERING_BEHAVIOR_ALLOW_WHITELIST,
+  FILTERING_BEHAVIOR_MAX = FILTERING_BEHAVIOR_ALLOW_WHITELIST
 };
 const int kHistogramFilteringBehaviorSpacing = 100;
 const int kHistogramPageTransitionMaxKnownValue =
     static_cast<int>(ui::PAGE_TRANSITION_KEYWORD_GENERATED);
 const int kHistogramPageTransitionFallbackValue =
     kHistogramFilteringBehaviorSpacing - 1;
-const int kHistogramMax = 700;
+const int kHistogramMax = 800;
 
 static_assert(kHistogramPageTransitionMaxKnownValue <
                   kHistogramPageTransitionFallbackValue,
@@ -52,6 +53,8 @@ int GetHistogramValueForFilteringBehavior(
     bool uncertain) {
   switch (behavior) {
     case SupervisedUserURLFilter::ALLOW:
+      if (reason == SupervisedUserURLFilter::WHITELIST)
+        return FILTERING_BEHAVIOR_ALLOW_WHITELIST;

[Marc Treib, 2016/03/17 10:53:14]

This should go under the case for WARN - those are treated the same. WARN isn't
actually used, but still.
(Don't we have a presubmit check or something that complains about the
fallthrough?!)

[atanasova, 2016/03/17 11:13:21]

Done.

     case SupervisedUserURLFilter::WARN:
       return uncertain ? FILTERING_BEHAVIOR_ALLOW_UNCERTAIN
                        : FILTERING_BEHAVIOR_ALLOW;