Add a source to the result of PermissionContextBase::GetPermissionStatus

chrome/browser/permissions/permission_context_base.h

Index: chrome/browser/permissions/permission_context_base.h
diff --git a/chrome/browser/permissions/permission_context_base.h b/chrome/browser/permissions/permission_context_base.h
index 5b94cccc80c2e9fff8869458eae3590544adcf6b..2b4117ebee9711467a8e7769b941201f634038c7 100644
--- a/chrome/browser/permissions/permission_context_base.h
+++ b/chrome/browser/permissions/permission_context_base.h
@@ -30,6 +30,38 @@ class WebContents;
 
 using BrowserPermissionCallback = base::Callback<void(ContentSetting)>;
 
+// Identifies the source or reason for a permission status being returned.
+enum class PermissionStatusSource {

[kcarattini, 2017/02/07 22:53:33]

Should we have a USER_DECISION value as well?

[raymes, 2017/02/08 04:08:40]

Yes eventually. I didn't want to add it right now because it will be unused and
it will take care to add it in a correct way. I only want to add ones that will
get used right now so we don't have dead code. In fact for that reason I'm going
to remove the INSECURE_ORIGIN and KILL_SWITCH check for now. I'll add
KILL_SWITCH back and use it for media_permission.cc in a followup CL. The other
two should be directly used by Meredith.

That makes this CL look a little bit weird, because the reasons aren't currently
used anywhere. So if it makes more sense, Meredith could merge this into her CL
which will use it. WDYT?

+  // The status is the result of being blocked because the requesting origin is
+  // not https.
+  INSECURE_ORIGIN,
+
+  // The status is the result of being blocked by the permissions kill switch.
+  KILL_SWITCH,
+
+  // The status is the result of being blocked due to the user dismissing a
+  // permission prompt multiple times.
+  MULTIPLE_DISMISSALS,
+
+  // The status is the resultof being blocked because the permission is on the
+  // safe browsing blacklist.
+  SAFE_BROWSING_BLACKLIST,
+
+  // The reason for the status is not specified. Avoid returning this value. It
+  // only exists until code has been added to correctly return a source in all
+  // cases.
+  UNSPECIFIED
+};
+
+struct PermissionResult {
+  PermissionResult(ContentSetting content_setting,
+                   PermissionStatusSource source);
+  ~PermissionResult();
+
+  ContentSetting content_setting;
+  PermissionStatusSource source;
+};
+
 // This base class contains common operations for granting permissions.
 // It offers the following functionality:
 //   - Creates a permission request when needed.
@@ -83,8 +115,8 @@ class PermissionContextBase : public KeyedService {
   // Returns whether the permission has been granted, denied etc.
   // TODO(meredithl): Ensure that the result accurately reflects whether the
   // origin is blacklisted for this permission.
-  ContentSetting GetPermissionStatus(const GURL& requesting_origin,
-                                     const GURL& embedding_origin) const;
+  PermissionResult GetPermissionStatus(const GURL& requesting_origin,
+                                       const GURL& embedding_origin) const;
 
   // Resets the permission to its default value.
   virtual void ResetPermission(const GURL& requesting_origin,