Implement permission embargo suppression metrics.

chrome/browser/permissions/permission_decision_auto_blocker.cc

 // Copyright 2016 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_decision_auto_blocker.h"
 
 #include <memory>
 
 #include "base/feature_list.h"
 #include "base/memory/ptr_util.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/content_settings/host_content_settings_map_factory.h"
 #include "chrome/browser/permissions/permission_blacklist_client.h"
-#include "chrome/browser/permissions/permission_util.h"
 #include "chrome/browser/profiles/incognito_helpers.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/safe_browsing/safe_browsing_service.h"
 #include "chrome/common/chrome_features.h"
 #include "components/content_settings/core/browser/host_content_settings_map.h"
 #include "components/keyed_service/content/browser_context_dependency_manager.h"
 #include "components/safe_browsing_db/database_manager.h"
 #include "components/variations/variations_associated_data.h"
 #include "content/public/browser/web_contents.h"
 #include "url/gurl.h"
@@ skipping 236 matching lines @@
       dismissal_embargo_days > 0) {
     g_dismissal_embargo_days = dismissal_embargo_days;
   }
 }
 
 void PermissionDecisionAutoBlocker::UpdateEmbargoedStatus(
     ContentSettingsType permission,
     const GURL& request_origin,
     content::WebContents* web_contents,
     base::Callback<void(bool)> callback) {
-  DCHECK(!IsUnderEmbargo(permission, request_origin));
+  DCHECK(GetEmbargoResult(permission, request_origin).content_setting ==
+         CONTENT_SETTING_ASK);

[raymes, 2017/02/22 23:13:50]

nit: DCHECK_EQ(CONTENT_SETTING_ASK, ...)

[dominickn, 2017/02/22 23:38:54]

Done.

 
   if (base::FeatureList::IsEnabled(features::kPermissionsBlacklist) &&
       db_manager_) {
     // The CheckSafeBrowsingResult callback won't be called if the profile is
     // destroyed before a result is received. In that case this object will have
     // been destroyed by that point.
     PermissionBlacklistClient::CheckSafeBrowsingBlacklist(
         db_manager_, permission, request_origin, web_contents,
         safe_browsing_timeout_,
         base::Bind(&PermissionDecisionAutoBlocker::CheckSafeBrowsingResult,
                    base::Unretained(this), permission, request_origin,
                    callback));
     return;
   }
 
   callback.Run(false /* permission blocked */);
 }
 
-bool PermissionDecisionAutoBlocker::IsUnderEmbargo(
+PermissionResult PermissionDecisionAutoBlocker::GetEmbargoResult(
     ContentSettingsType permission,
     const GURL& request_origin) {
   HostContentSettingsMap* map =
       HostContentSettingsMapFactory::GetForProfile(profile_);
   std::unique_ptr<base::DictionaryValue> dict =
       GetOriginDict(map, request_origin);
   base::DictionaryValue* permission_dict = GetOrCreatePermissionDict(
       dict.get(), PermissionUtil::GetPermissionString(permission));
   double embargo_date = -1;
-  bool is_under_dismiss_embargo = false;
-  bool is_under_blacklist_embargo = false;
+
+  PermissionStatusSource reason = PermissionStatusSource::UNSPECIFIED;
+  ContentSetting setting = CONTENT_SETTING_ASK;
   base::Time current_time = clock_->Now();
   if (base::FeatureList::IsEnabled(features::kPermissionsBlacklist) &&
       permission_dict->GetDouble(kPermissionBlacklistEmbargoKey,
                                  &embargo_date)) {
     if (current_time <
         base::Time::FromInternalValue(embargo_date) +
             base::TimeDelta::FromDays(g_blacklist_embargo_days)) {
-      is_under_blacklist_embargo = true;
+      reason = PermissionStatusSource::SAFE_BROWSING_BLACKLIST;
+      setting = CONTENT_SETTING_BLOCK;

[raymes, 2017/02/22 23:13:50]

Can we just 
return PermissionResult(CONTENT_SETTING_BLOCK,
PermissionStatusSource::SAFE_BROWSING_BLACKLIST) 

here (and likewise below)? It saves storing the local state which is slightly
more error prone when adding new cases.

[dominickn, 2017/02/22 23:38:54]

Done.

     }
   }
 
   if (base::FeatureList::IsEnabled(features::kBlockPromptsIfDismissedOften) &&
       permission_dict->GetDouble(kPermissionDismissalEmbargoKey,
                                  &embargo_date)) {
     if (current_time <
         base::Time::FromInternalValue(embargo_date) +
             base::TimeDelta::FromDays(g_dismissal_embargo_days)) {
-      is_under_dismiss_embargo = true;
+      reason = PermissionStatusSource::MULTIPLE_DISMISSALS;
+      setting = CONTENT_SETTING_BLOCK;
     }
   }
 
-  // If either embargo is still in effect, return true.
-  return is_under_dismiss_embargo || is_under_blacklist_embargo;
+  return PermissionResult(setting, reason);
 }
 
 void PermissionDecisionAutoBlocker::CheckSafeBrowsingResult(
     ContentSettingsType permission,
     const GURL& request_origin,
     base::Callback<void(bool)> callback,
     bool should_be_embargoed) {
   if (should_be_embargoed) {
     // Requesting site is blacklisted for this permission, update the content
     // setting to place it under embargo.
@@ skipping 24 matching lines @@
         scoped_refptr<safe_browsing::SafeBrowsingDatabaseManager> db_manager,
         int timeout) {
   db_manager_ = db_manager;
   safe_browsing_timeout_ = timeout;
 }
 
 void PermissionDecisionAutoBlocker::SetClockForTesting(
     std::unique_ptr<base::Clock> clock) {
   clock_ = std::move(clock);
 }