Rename PermissionBubbleRequest to PermissionRequest

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"
 #include "base/strings/stringprintf.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/permissions/permission_manager.h"
+#include "chrome/browser/permissions/permission_request.h"
 #include "chrome/browser/permissions/permission_util.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/safe_browsing/safe_browsing_service.h"
 #include "chrome/browser/safe_browsing/ui_manager.h"
 #include "chrome/browser/sync/profile_sync_service_factory.h"
-#include "chrome/browser/ui/website_settings/permission_bubble_request.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
 #include "components/browser_sync/browser/profile_sync_service.h"
 #include "components/prefs/pref_service.h"
 #include "components/rappor/rappor_service.h"
 #include "components/rappor/rappor_utils.h"
 #include "content/public/browser/permission_type.h"
 #include "content/public/common/origin_util.h"
 #include "url/gurl.h"
 
 // UMA keys need to be statically initialized so plain function would not
 // work. Use macros instead.
 #define PERMISSION_ACTION_UMA(secure_origin, permission, permission_secure, \
                               permission_insecure, action)                  \
   UMA_HISTOGRAM_ENUMERATION(permission, action, PERMISSION_ACTION_NUM);     \
   if (secure_origin) {                                                      \
     UMA_HISTOGRAM_ENUMERATION(permission_secure, action,                    \
                               PERMISSION_ACTION_NUM);                       \
   } else {                                                                  \
     UMA_HISTOGRAM_ENUMERATION(permission_insecure, action,                  \
                               PERMISSION_ACTION_NUM);                       \
   }
 
 #define PERMISSION_BUBBLE_TYPE_UMA(metric_name, permission_bubble_type)      \
     UMA_HISTOGRAM_ENUMERATION(                                               \
         metric_name,                                                         \
         static_cast<base::HistogramBase::Sample>(permission_bubble_type),    \
-        static_cast<base::HistogramBase::Sample>(PermissionBubbleType::NUM))
+        static_cast<base::HistogramBase::Sample>(PermissionRequestType::NUM))
 
 using content::PermissionType;
 
 namespace {
 
 const std::string GetRapporMetric(PermissionType permission,
                                   PermissionAction action) {
   std::string action_str;
   switch (action) {
     case GRANTED:
@@ skipping 167 matching lines @@
   // permissions.
   if (permission == PermissionType::NOTIFICATIONS ||
       permission == PermissionType::GEOLOCATION ||
       permission == PermissionType::AUDIO_CAPTURE ||
       permission == PermissionType::VIDEO_CAPTURE) {
     RecordPermissionAction(permission, REVOKED, revoked_origin, profile);
   }
 }
 
 void PermissionUmaUtil::PermissionPromptShown(
-    const std::vector<PermissionBubbleRequest*>& requests) {
+    const std::vector<PermissionRequest*>& requests) {
   DCHECK(!requests.empty());
 
-  PermissionBubbleType permission_prompt_type = PermissionBubbleType::MULTIPLE;
+  PermissionRequestType permission_prompt_type =
+      PermissionRequestType::MULTIPLE;
   if (requests.size() == 1)
-    permission_prompt_type = requests[0]->GetPermissionBubbleType();
+    permission_prompt_type = requests[0]->GetPermissionRequestType();
   PERMISSION_BUBBLE_TYPE_UMA(kPermissionsPromptShown, permission_prompt_type);
 
   UMA_HISTOGRAM_ENUMERATION(
       kPermissionsPromptRequestsPerPrompt,
       static_cast<base::HistogramBase::Sample>(requests.size()),
       static_cast<base::HistogramBase::Sample>(10));
 
   if (requests.size() > 1) {
     for (const auto* request : requests) {
       PERMISSION_BUBBLE_TYPE_UMA(kPermissionsPromptMergedBubbleTypes,
-                                 request->GetPermissionBubbleType());
+                                 request->GetPermissionRequestType());
     }
   }
 }
 
 void PermissionUmaUtil::PermissionPromptAccepted(
-    const std::vector<PermissionBubbleRequest*>& requests,
+    const std::vector<PermissionRequest*>& requests,
     const std::vector<bool>& accept_states) {
   DCHECK(!requests.empty());
   DCHECK(requests.size() == accept_states.size());
 
   bool all_accepted = accept_states[0];
-  PermissionBubbleType permission_prompt_type =
-      requests[0]->GetPermissionBubbleType();
+  PermissionRequestType permission_prompt_type =
+      requests[0]->GetPermissionRequestType();
   if (requests.size() > 1) {
-    permission_prompt_type = PermissionBubbleType::MULTIPLE;
+    permission_prompt_type = PermissionRequestType::MULTIPLE;
     for (size_t i = 0; i < requests.size(); ++i) {
       const auto* request = requests[i];
       if (accept_states[i]) {
         PERMISSION_BUBBLE_TYPE_UMA(kPermissionsPromptMergedBubbleAccepted,
-                                   request->GetPermissionBubbleType());
+                                   request->GetPermissionRequestType());
       } else {
         all_accepted = false;
         PERMISSION_BUBBLE_TYPE_UMA(kPermissionsPromptMergedBubbleDenied,
-                                   request->GetPermissionBubbleType());
+                                   request->GetPermissionRequestType());
       }
     }
   }
 
   if (all_accepted) {
     PERMISSION_BUBBLE_TYPE_UMA(kPermissionsPromptAccepted,
                                permission_prompt_type);
   } else {
     PERMISSION_BUBBLE_TYPE_UMA(kPermissionsPromptDenied,
                                permission_prompt_type);
   }
 }
 
 void PermissionUmaUtil::PermissionPromptDenied(
-    const std::vector<PermissionBubbleRequest*>& requests) {
+    const std::vector<PermissionRequest*>& requests) {
   DCHECK(!requests.empty());
   DCHECK(requests.size() == 1);
 
   PERMISSION_BUBBLE_TYPE_UMA(kPermissionsPromptDenied,
-                             requests[0]->GetPermissionBubbleType());
+                             requests[0]->GetPermissionRequestType());
 }
 
 bool PermissionUmaUtil::IsOptedIntoPermissionActionReporting(Profile* profile) {
   if (!base::CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kEnablePermissionActionReporting))
     return false;
   // TODO(stefanocs): Remove this check once all callsites have been updated
   // to not pass a nullptr.
   if (!profile)
     return false;
@@ skipping 105 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->RecordSample(
         rappor_metric, rappor::LOW_FREQUENCY_ETLD_PLUS_ONE_RAPPOR_TYPE,
         rappor::GetDomainAndRegistrySampleFromGURL(requesting_origin));
   }
 }