Make PermissionManager use ContentSettingsType internally more

chrome/browser/permissions/permission_uma_util.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_uma_util.h"
 
 #include <utility>
 
 #include "base/command_line.h"
 #include "base/metrics/histogram_macros.h"
@@ skipping 76 matching lines @@
       break;
   }
 
   std::string permission_str = PermissionUtil::GetPermissionString(permission);
   if (permission_str.empty())
     return "";
   return base::StringPrintf("ContentSettings.PermissionActions_%s.%s.Url",
                             permission_str.c_str(), action_str.c_str());
 }
 
-void RecordPermissionRequest(PermissionType permission,
+void RecordPermissionRequest(ContentSettingsType content_type,
                              const GURL& requesting_origin,
                              const GURL& embedding_origin,
                              Profile* profile) {
   rappor::RapporServiceImpl* rappor_service =
       g_browser_process->rappor_service();
   if (rappor_service) {
-    if (permission == PermissionType::GEOLOCATION) {
+    if (content_type == CONTENT_SETTINGS_TYPE_GEOLOCATION) {
       // TODO(dominickn): remove this deprecated metric - crbug.com/605836.
       rappor::SampleDomainAndRegistryFromGURL(
           rappor_service, "ContentSettings.PermissionRequested.Geolocation.Url",
           requesting_origin);
       rappor_service->RecordSampleString(
           "ContentSettings.PermissionRequested.Geolocation.Url2",
           rappor::LOW_FREQUENCY_ETLD_PLUS_ONE_RAPPOR_TYPE,
           rappor::GetDomainAndRegistrySampleFromGURL(requesting_origin));
-    } else if (permission == PermissionType::NOTIFICATIONS) {
+    } else if (content_type == CONTENT_SETTINGS_TYPE_NOTIFICATIONS) {
       // TODO(dominickn): remove this deprecated metric - crbug.com/605836.
       rappor::SampleDomainAndRegistryFromGURL(
           rappor_service,
           "ContentSettings.PermissionRequested.Notifications.Url",
           requesting_origin);
       rappor_service->RecordSampleString(
           "ContentSettings.PermissionRequested.Notifications.Url2",
           rappor::LOW_FREQUENCY_ETLD_PLUS_ONE_RAPPOR_TYPE,
           rappor::GetDomainAndRegistrySampleFromGURL(requesting_origin));
-    } else if (permission == PermissionType::MIDI ||
-               permission == PermissionType::MIDI_SYSEX) {
+    } else if (content_type == CONTENT_SETTINGS_TYPE_MIDI ||
+               content_type == CONTENT_SETTINGS_TYPE_MIDI_SYSEX) {
       // TODO(dominickn): remove this deprecated metric - crbug.com/605836.
       rappor::SampleDomainAndRegistryFromGURL(
           rappor_service, "ContentSettings.PermissionRequested.Midi.Url",
           requesting_origin);
       rappor_service->RecordSampleString(
           "ContentSettings.PermissionRequested.Midi.Url2",
           rappor::LOW_FREQUENCY_ETLD_PLUS_ONE_RAPPOR_TYPE,
           rappor::GetDomainAndRegistrySampleFromGURL(requesting_origin));
-    } else if (permission == PermissionType::PROTECTED_MEDIA_IDENTIFIER) {
+    } else if (content_type ==
+               CONTENT_SETTINGS_TYPE_PROTECTED_MEDIA_IDENTIFIER) {
       rappor_service->RecordSampleString(
           "ContentSettings.PermissionRequested.ProtectedMedia.Url2",
           rappor::LOW_FREQUENCY_ETLD_PLUS_ONE_RAPPOR_TYPE,
           rappor::GetDomainAndRegistrySampleFromGURL(requesting_origin));
     }
   }
 
+  PermissionType permission;
+  bool success = PermissionUtil::GetPermissionType(content_type, &permission);
+  DCHECK(success);
+
   bool secure_origin = content::IsOriginSecure(requesting_origin);
   UMA_HISTOGRAM_ENUMERATION(
       "ContentSettings.PermissionRequested",
       static_cast<base::HistogramBase::Sample>(permission),
       static_cast<base::HistogramBase::Sample>(PermissionType::NUM));
   if (secure_origin) {
     UMA_HISTOGRAM_ENUMERATION(
         "ContentSettings.PermissionRequested_SecureOrigin",
         static_cast<base::HistogramBase::Sample>(permission),
         static_cast<base::HistogramBase::Sample>(PermissionType::NUM));
   } else {
     UMA_HISTOGRAM_ENUMERATION(
         "ContentSettings.PermissionRequested_InsecureOrigin",
         static_cast<base::HistogramBase::Sample>(permission),
         static_cast<base::HistogramBase::Sample>(PermissionType::NUM));
   }
 
   // In order to gauge the compatibility risk of implementing an improved
   // iframe permissions security model, we would like to know the ratio of
   // same-origin to cross-origin permission requests. Our estimate of this
   // ratio could be somewhat biased by repeated requests coming from a
   // single frame, but we expect this to be insignificant.
   if (requesting_origin.GetOrigin() != embedding_origin.GetOrigin()) {
-    content::PermissionManager* manager = profile->GetPermissionManager();
+    PermissionManager* manager = PermissionManager::Get(profile);
     if (!manager)
       return;
     blink::mojom::PermissionStatus embedding_permission_status =
-        manager->GetPermissionStatus(permission, embedding_origin,
+        manager->GetPermissionStatus(content_type, embedding_origin,
                                      embedding_origin);
 
     base::HistogramBase* histogram = base::LinearHistogram::FactoryGet(
         "Permissions.Requested.CrossOrigin_" +
-            PermissionUtil::GetPermissionString(permission),
+            PermissionUtil::GetPermissionString(content_type),
         1, static_cast<int>(blink::mojom::PermissionStatus::LAST),
         static_cast<int>(blink::mojom::PermissionStatus::LAST) + 1,
         base::HistogramBase::kUmaTargetedHistogramFlag);
     histogram->Add(static_cast<int>(embedding_permission_status));
   } else {
     UMA_HISTOGRAM_ENUMERATION(
         "Permissions.Requested.SameOrigin",
         static_cast<base::HistogramBase::Sample>(permission),
         static_cast<base::HistogramBase::Sample>(PermissionType::NUM));
   }
@@ skipping 68 matching lines @@
         "Permissions.Prompt.Dismissed.PriorIgnoreCount.";
 const char
     PermissionUmaUtil::kPermissionsPromptIgnoredPriorDismissCountPrefix[] =
         "Permissions.Prompt.Ignored.PriorDismissCount.";
 const char
     PermissionUmaUtil::kPermissionsPromptIgnoredPriorIgnoreCountPrefix[] =
         "Permissions.Prompt.Ignored.PriorIgnoreCount.";
 
 // Make sure you update histograms.xml permission histogram_suffix if you
 // add new permission
-void PermissionUmaUtil::PermissionRequested(PermissionType permission,
-                                            const GURL& requesting_origin,
-                                            const GURL& embedding_origin,
-                                            Profile* profile) {
-  RecordPermissionRequest(permission, requesting_origin, embedding_origin,
-                          profile);
-}
-
 void PermissionUmaUtil::PermissionRequested(ContentSettingsType content_type,
                                             const GURL& requesting_origin,
                                             const GURL& embedding_origin,
                                             Profile* profile) {
-  PermissionType permission;
-  bool success = PermissionUtil::GetPermissionType(content_type, &permission);
-  DCHECK(success);
-  RecordPermissionRequest(permission, requesting_origin, embedding_origin,
+  RecordPermissionRequest(content_type, requesting_origin, embedding_origin,
                           profile);
 }
 
 void PermissionUmaUtil::PermissionGranted(
     ContentSettingsType permission,
     PermissionRequestGestureType gesture_type,
     const GURL& requesting_origin,
     Profile* profile) {
   PermissionDecisionAutoBlocker* autoblocker =
       PermissionDecisionAutoBlocker::GetForProfile(profile);
@@ skipping 448 matching lines @@
   if (!deprecated_metric.empty() && rappor_service) {
     rappor::SampleDomainAndRegistryFromGURL(rappor_service, deprecated_metric,
                                             requesting_origin);
 
     std::string rappor_metric = deprecated_metric + "2";
     rappor_service->RecordSampleString(
         rappor_metric, rappor::LOW_FREQUENCY_ETLD_PLUS_ONE_RAPPOR_TYPE,
         rappor::GetDomainAndRegistrySampleFromGURL(requesting_origin));
   }
 }