Move kill switch and secure origin checking logic

chrome/browser/permissions/permission_context_base.cc

Index: chrome/browser/permissions/permission_context_base.cc
diff --git a/chrome/browser/permissions/permission_context_base.cc b/chrome/browser/permissions/permission_context_base.cc
index 4fbe7f9a93e10c26334648f144233f914e30c87d..42ea34f91a2017d4eec893d5ff443ef25dc768e9 100644
--- a/chrome/browser/permissions/permission_context_base.cc
+++ b/chrome/browser/permissions/permission_context_base.cc
@@ -124,7 +124,6 @@ void PermissionContextBase::RequestPermission(
 ContentSetting PermissionContextBase::GetPermissionStatus(
     const GURL& requesting_origin,
     const GURL& embedding_origin) const {
-
   // If the permission has been disabled through Finch, block all requests.
   if (IsPermissionKillSwitchOn())
     return CONTENT_SETTING_BLOCK;
@@ -134,9 +133,7 @@ ContentSetting PermissionContextBase::GetPermissionStatus(
     return CONTENT_SETTING_BLOCK;
   }
 
-  return HostContentSettingsMapFactory::GetForProfile(profile_)
-      ->GetContentSetting(requesting_origin, embedding_origin,
-                          content_settings_type_, std::string());
+  return GetPermissionStatusInternal(requesting_origin, embedding_origin);
 }
 
 void PermissionContextBase::ResetPermission(
@@ -169,6 +166,22 @@ void PermissionContextBase::CancelPermissionRequest(
   }
 }
 
+bool PermissionContextBase::IsPermissionKillSwitchOn() const {
+  const std::string param = variations::GetVariationParamValue(
+      kPermissionsKillSwitchFieldStudy,
+      PermissionUtil::GetPermissionString(permission_type_));
+
+  return param == kPermissionsKillSwitchBlockedValue;
+}
+
+ContentSetting PermissionContextBase::GetPermissionStatusInternal(
+    const GURL& requesting_origin,
+    const GURL& embedding_origin) const {
+  return HostContentSettingsMapFactory::GetForProfile(profile_)
+      ->GetContentSetting(requesting_origin, embedding_origin,
+                          content_settings_type_, std::string());
+}
+
 void PermissionContextBase::DecidePermission(
     content::WebContents* web_contents,
     const PermissionRequestID& id,
@@ -310,11 +323,3 @@ void PermissionContextBase::UpdateContentSetting(
                                       content_settings_type_, std::string(),
                                       content_setting);
 }
-
-bool PermissionContextBase::IsPermissionKillSwitchOn() const {
-  const std::string param = variations::GetVariationParamValue(
-      kPermissionsKillSwitchFieldStudy,
-      PermissionUtil::GetPermissionString(permission_type_));
-
-  return param == kPermissionsKillSwitchBlockedValue;
-}