Use PermissionType instead of ContentSettingsType in Android permission infobars

chrome/browser/permissions/permission_infobar_delegate.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_infobar_delegate.h"
 
 #include "chrome/browser/permissions/permission_decision_auto_blocker.h"
 #include "chrome/browser/permissions/permission_request.h"
 #include "chrome/browser/permissions/permission_uma_util.h"
 #include "chrome/grit/generated_resources.h"
 #include "components/url_formatter/elide_url.h"
 #include "ui/base/l10n/l10n_util.h"
 
 PermissionInfoBarDelegate::~PermissionInfoBarDelegate() {
   if (!action_taken_) {
     PermissionUmaUtil::PermissionIgnored(
         permission_type_,
         user_gesture_ ? PermissionRequestGestureType::GESTURE
                       : PermissionRequestGestureType::NO_GESTURE,
         requesting_origin_, profile_);
   }
 }
 
 PermissionInfoBarDelegate::PermissionInfoBarDelegate(
     const GURL& requesting_origin,
     content::PermissionType permission_type,
-    ContentSettingsType content_settings_type,
     bool user_gesture,
     Profile* profile,
     const PermissionSetCallback& callback)
     : requesting_origin_(requesting_origin),
       permission_type_(permission_type),
-      content_settings_type_(content_settings_type),
       profile_(profile),
       callback_(callback),
       action_taken_(false),
       user_gesture_(user_gesture),
       persist_(true) {}
 
-std::vector<int> PermissionInfoBarDelegate::content_settings() const {
-  return std::vector<int>{content_settings_type_};
+std::vector<int> PermissionInfoBarDelegate::permission_types() const {
+  return std::vector<int>{static_cast<int>(permission_type_)};
 }
 
 bool PermissionInfoBarDelegate::ShouldShowPersistenceToggle() const {
   return (permission_type_ == content::PermissionType::GEOLOCATION ||
           permission_type_ == content::PermissionType::AUDIO_CAPTURE ||
           permission_type_ == content::PermissionType::VIDEO_CAPTURE) &&
          PermissionUtil::ShouldShowPersistenceToggle();
 }
 
 base::string16 PermissionInfoBarDelegate::GetMessageText() const {
@@ skipping 46 matching lines @@
 
   SetPermission(update_content_setting, DENIED);
   return true;
 }
 
 void PermissionInfoBarDelegate::SetPermission(bool update_content_setting,
                                               PermissionAction decision) {
   action_taken_ = true;
   callback_.Run(update_content_setting, decision);
 }