Add UMA for autoblocking and embargoing.

chrome/browser/permissions/permission_context_base_unittest.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/permissions/permission_context_base.h"
 
 #include <map>
 #include <set>
 #include <string>
 #include <utility>
 #include <vector>
 
 #include "base/bind.h"
 #include "base/feature_list.h"
 #include "base/macros.h"
 #include "base/memory/ptr_util.h"
 #include "base/metrics/field_trial.h"
 #include "base/run_loop.h"
 #include "base/test/histogram_tester.h"
 #include "base/test/mock_entropy_provider.h"
 #include "base/test/scoped_feature_list.h"
 #include "build/build_config.h"
 #include "chrome/browser/content_settings/host_content_settings_map_factory.h"
 #include "chrome/browser/infobars/infobar_service.h"
 #include "chrome/browser/permissions/permission_decision_auto_blocker.h"
 #include "chrome/browser/permissions/permission_queue_controller.h"
 #include "chrome/browser/permissions/permission_request_id.h"
+#include "chrome/browser/permissions/permission_uma_util.h"
 #include "chrome/browser/permissions/permission_util.h"
 #include "chrome/common/chrome_features.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/test/base/chrome_render_view_host_test_harness.h"
 #include "chrome/test/base/testing_profile.h"
 #include "components/content_settings/core/browser/host_content_settings_map.h"
 #include "components/content_settings/core/common/content_settings.h"
 #include "components/content_settings/core/common/content_settings_types.h"
 #include "components/safe_browsing_db/database_manager.h"
 #include "components/safe_browsing_db/test_database_manager.h"
@@ skipping 243 matching lines @@
                    base::Unretained(this), &permission_context, id, url,
                    persist, decision));
     permission_context.RequestPermission(
         web_contents(),
         id, url, true /* user_gesture */,
         base::Bind(&TestPermissionContext::TrackPermissionDecision,
                    base::Unretained(&permission_context)));
     ASSERT_EQ(1u, permission_context.decisions().size());
     EXPECT_EQ(decision, permission_context.decisions()[0]);
     EXPECT_TRUE(permission_context.tab_context_updated());
-
+    histograms.ExpectBucketCount("Permissions.AutoBlocker.EmbargoReason",
+                                 PermissionEmbargoReason::NOT_EMBARGOED, 1);
     std::string decision_string;
     if (decision == CONTENT_SETTING_ALLOW)
       decision_string = "Accepted";
     else if (decision == CONTENT_SETTING_BLOCK)
       decision_string = "Denied";
     else if (decision == CONTENT_SETTING_ASK)
       decision_string = "Dismissed";
 
     if (decision_string.size()) {
       histograms.ExpectUniqueSample(
@@ skipping 43 matching lines @@
           base::Bind(&TestPermissionContext::TrackPermissionDecision,
                     base::Unretained(&permission_context)));
       histograms.ExpectTotalCount(
           "Permissions.Prompt.Dismissed.PriorDismissCount." +
               PermissionUtil::GetPermissionString(permission_type),
           i + 1);
       histograms.ExpectBucketCount(
           "Permissions.Prompt.Dismissed.PriorDismissCount." +
               PermissionUtil::GetPermissionString(permission_type),
           i, 1);
+      histograms.ExpectTotalCount("Permissions.AutoBlocker.EmbargoReason",

[dominickn, 2017/01/30 04:55:25]

Can you use ExpectUniqueSample("Permissions.AutoBlocker.EmbargoReason",
PermissionEmbargoReason::NOT_EMBARGOED, i + 1) here?

 - ExpectUniqueSample(name, value, number) means "I expect there to be <number>
count of <value> in <name> histogram ONLY (no other values present). That is,
<value> was recorded <number> times exclusively
 - ExpectBucketCount(name, value, number) is the same, except other values might
be present
 - ExpectTotalCount(name, number) means "I expect there to be <number> total
recorded across all values.

The first two will crash if the histogram hasn't had anything recorded in it
yet. TotalCount can be used always.

[meredithl, 2017/01/30 05:37:40]

That will succeed for the first N-1 requests, but for the Nth request, it has
been recorded as PermissionEmbargoReason::REPEATED_DISMISSALS by the
autoblocker, which is why I just verify that N things have been recorded, and
then verify after the loop that the right number of NOT_EMBARGO is recorded. It
was easier than writing it into an if statement inside the loop for just the
last request.

[dominickn, 2017/01/30 05:52:28]

Ah, acknowledged. I forgot that we changed this to a straight loop and then back
to this change-on-the-last design again.

+                                  i + 1);
       ASSERT_EQ(1u, permission_context.decisions().size());
       EXPECT_EQ(expected, permission_context.decisions()[0]);
       EXPECT_TRUE(permission_context.tab_context_updated());
       EXPECT_EQ(expected, permission_context.GetPermissionStatus(url, url));
     }
 
+    histograms.ExpectBucketCount("Permissions.AutoBlocker.EmbargoReason",

[dominickn, 2017/01/30 04:55:25]

Remove this one, it's covered by the check in the loop.

[meredithl, 2017/01/30 05:37:40]

See above, i either need to move the inner loop check to an if statement to
check which request we are on, or just check it after the loop has exited.

[dominickn, 2017/01/30 05:52:28]

Acknowledged.

+                                 PermissionEmbargoReason::NOT_EMBARGOED,
+                                 iterations - 1);
     TestPermissionContext permission_context(profile(), permission_type,
                                              content_settings_type);
     const PermissionRequestID id(
         web_contents()->GetRenderProcessHost()->GetID(),
         web_contents()->GetMainFrame()->GetRoutingID(), -1);
 
     permission_context.SetRespondPermissionCallback(
         base::Bind(&PermissionContextBaseTests::RespondToPermission,
                    base::Unretained(this), &permission_context, id, url, false,
                    CONTENT_SETTING_ASK));
 
     permission_context.RequestPermission(
         web_contents(), id, url, true /* user_gesture */,
         base::Bind(&TestPermissionContext::TrackPermissionDecision,
                    base::Unretained(&permission_context)));
 
     EXPECT_EQ(CONTENT_SETTING_BLOCK,
               permission_context.GetPermissionStatus(url, url));
+    histograms.ExpectTotalCount("Permissions.AutoBlocker.EmbargoReason",
+                                iterations);
+    histograms.ExpectBucketCount("Permissions.AutoBlocker.EmbargoReason",
+                                 PermissionEmbargoReason::REPEATED_DISMISSALS,
+                                 1);

[dominickn, 2017/01/30 04:55:25]

And an ExpectBucketCount for NOT_EMBARGOED (iterations - 1)?

[meredithl, 2017/01/30 05:37:40]

I've moved the one from above down to here.

   }
 
   void TestBlockOnSeveralDismissals_TestContent() {
     GURL url("https://www.google.com");
     NavigateAndCommit(url);
     base::HistogramTester histograms;
 
     // First, ensure that > 3 dismissals behaves correctly.
     for (uint32_t i = 0; i < 4; ++i) {
       TestPermissionContext permission_context(
@@ skipping 10 matching lines @@
                      false, CONTENT_SETTING_ASK));
       permission_context.RequestPermission(
           web_contents(), id, url, true /* user_gesture */,
           base::Bind(&TestPermissionContext::TrackPermissionDecision,
                     base::Unretained(&permission_context)));
       histograms.ExpectTotalCount(
           "Permissions.Prompt.Dismissed.PriorDismissCount.Geolocation",
           i + 1);
       histograms.ExpectBucketCount(
           "Permissions.Prompt.Dismissed.PriorDismissCount.Geolocation", i, 1);
+      histograms.ExpectBucketCount("Permissions.AutoBlocker.EmbargoReason",
+                                   PermissionEmbargoReason::NOT_EMBARGOED,
+                                   i + 1);
       ASSERT_EQ(1u, permission_context.decisions().size());
       EXPECT_EQ(CONTENT_SETTING_ASK, permission_context.decisions()[0]);
       EXPECT_TRUE(permission_context.tab_context_updated());
       EXPECT_EQ(CONTENT_SETTING_ASK,
                 permission_context.GetContentSettingFromMap(url, url));
     }
 
     // Flush the dismissal counts. Enable the block on too many dismissals
     // feature, which is disabled by default.
     auto* map = HostContentSettingsMapFactory::GetForProfile(profile());
@@ skipping 415 matching lines @@
 }
 
 // Tests a blacklisted (URL, permission) pair has had its permission request
 // blocked.
 TEST_F(PermissionContextBaseTests, TestPermissionsBlacklistingBlocked) {
   scoped_refptr<MockSafeBrowsingDatabaseManager> db_manager =
       new MockSafeBrowsingDatabaseManager(true /* perform_callback */);
   const GURL url("https://www.example.com");
   std::set<std::string> blacklisted_permissions{"GEOLOCATION"};
   db_manager->BlacklistUrlPermissions(url, blacklisted_permissions);
+  base::HistogramTester histograms;
   TestPermissionsBlacklisting(content::PermissionType::GEOLOCATION,
                               CONTENT_SETTINGS_TYPE_GEOLOCATION, db_manager,
                               url, 2000 /* timeout */, CONTENT_SETTING_BLOCK);
+  histograms.ExpectUniqueSample(
+      "Permissions.AutoBlocker.EmbargoReason",
+      PermissionEmbargoReason::PERMISSIONS_BLACKLISTING, 1);
 }
 
 // Tests that a URL that is blacklisted for one permission can still request
 // another and grant another.
 TEST_F(PermissionContextBaseTests, TestPermissionsBlacklistingAllowed) {
   scoped_refptr<MockSafeBrowsingDatabaseManager> db_manager =
       new MockSafeBrowsingDatabaseManager(true /* perform_callback */);
   const GURL url("https://www.example.com");
   std::set<std::string> blacklisted_permissions{"GEOLOCATION"};
   db_manager->BlacklistUrlPermissions(url, blacklisted_permissions);
+  base::HistogramTester histograms;
   TestPermissionsBlacklisting(content::PermissionType::NOTIFICATIONS,
                               CONTENT_SETTINGS_TYPE_NOTIFICATIONS, db_manager,
                               url, 2000 /* timeout */, CONTENT_SETTING_ALLOW);
+  histograms.ExpectUniqueSample("Permissions.AutoBlocker.EmbargoReason",
+                                PermissionEmbargoReason::NOT_EMBARGOED, 1);
 }