Use PermissionType instead of ContentSettingsType in Android permission infobars

chrome/browser/media/webrtc/media_stream_infobar_delegate_android.cc

Index: chrome/browser/media/webrtc/media_stream_infobar_delegate_android.cc
diff --git a/chrome/browser/media/webrtc/media_stream_infobar_delegate_android.cc b/chrome/browser/media/webrtc/media_stream_infobar_delegate_android.cc
index 23bfb353c0ee5f1b8666ba9e4d55e6d61f983c40..39025ae5877ddb006bfdbcd2327ab342eb69a534 100644
--- a/chrome/browser/media/webrtc/media_stream_infobar_delegate_android.cc
+++ b/chrome/browser/media/webrtc/media_stream_infobar_delegate_android.cc
@@ -16,9 +16,9 @@
 #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"
@@ -86,7 +86,6 @@ MediaStreamInfoBarDelegateAndroid::MediaStreamInfoBarDelegateAndroid(
           // 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.
@@ -187,11 +186,11 @@ 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;
 }