Use PermissionType instead of ContentSettingsType in Android permission infobars

chrome/browser/media/webrtc/media_stream_infobar_delegate_android.cc

 // Copyright (c) 2012 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/media/webrtc/media_stream_infobar_delegate_android.h"
 
 #include <stddef.h>
 #include <utility>
 
 #include "base/logging.h"
 #include "base/metrics/histogram_macros.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/infobars/infobar_service.h"
 #include "chrome/browser/permissions/permission_uma_util.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/grit/generated_resources.h"
 #include "chrome/grit/theme_resources.h"
-#include "components/content_settings/core/common/content_settings_types.h"
 #include "components/google/core/browser/google_util.h"
 #include "components/infobars/core/infobar.h"
+#include "content/public/browser/permission_type.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/common/origin_util.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "url/gurl.h"
 
 namespace {
 
 void DoNothing(bool update_content_setting, PermissionAction decision) {}
 
 }  // namespace
@@ skipping 47 matching lines @@
     std::unique_ptr<MediaStreamDevicesController> controller)
     : PermissionInfoBarDelegate(
           controller->GetOrigin(),
           // The content setting type and permission type here are only passed
           // in to fit into PermissionInfoBarDelegate, even though media infobar
           // controls both mic and camera. This is a temporary state for easy
           // refactoring.
           // TODO(lshang): Merge MediaStreamInfoBarDelegateAndroid into
           // GroupedPermissionInfoBarDelegate. See crbug.com/606138.
           content::PermissionType::AUDIO_CAPTURE,
-          CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC,
           false,
           profile,
           // This is only passed in to fit into PermissionInfoBarDelegate.
           // Infobar accepted/denied/dismissed is handled by controller, not via
           // callbacks.
           base::Bind(&DoNothing)),
       controller_(std::move(controller)) {
   DCHECK(controller_.get());
   DCHECK(controller_->IsAskingForAudio() || controller_->IsAskingForVideo());
 }
@@ skipping 80 matching lines @@
 }
 
 base::string16 MediaStreamInfoBarDelegateAndroid::GetLinkText() const {
   return base::string16();
 }
 
 GURL MediaStreamInfoBarDelegateAndroid::GetLinkURL() const {
   return GURL(chrome::kMediaAccessLearnMoreUrl);
 }
 
-std::vector<int> MediaStreamInfoBarDelegateAndroid::content_settings() const {
+std::vector<int> MediaStreamInfoBarDelegateAndroid::permission_types() const {
   std::vector<int> types;
   if (controller_->IsAskingForAudio())
-    types.push_back(CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC);
+    types.push_back(static_cast<int>(content::PermissionType::AUDIO_CAPTURE));
   if (controller_->IsAskingForVideo())
-    types.push_back(CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA);
+    types.push_back(static_cast<int>(content::PermissionType::VIDEO_CAPTURE));
   return types;
 }