Clean up the PermissionInfoBarDelegate hierarchy.

chrome/browser/ui/android/infobars/permission_infobar.cc

Index: chrome/browser/ui/android/infobars/permission_infobar.cc
diff --git a/chrome/browser/ui/android/infobars/permission_infobar.cc b/chrome/browser/ui/android/infobars/permission_infobar.cc
index 3fafa3f5956186529508dca5f06373e3bf18f1d1..a9db798e5eab58a7995ebc373bc3d782c305248e 100644
--- a/chrome/browser/ui/android/infobars/permission_infobar.cc
+++ b/chrome/browser/ui/android/infobars/permission_infobar.cc
@@ -21,29 +21,29 @@
 using base::android::ScopedJavaLocalRef;
 
 std::unique_ptr<infobars::InfoBar> CreatePermissionInfoBar(
-    std::unique_ptr<PermissionInfobarDelegate> delegate) {
+    std::unique_ptr<PermissionInfoBarDelegate> delegate) {
   return base::WrapUnique(new PermissionInfoBar(std::move(delegate)));
 }
 
 PermissionInfoBar::PermissionInfoBar(
-    std::unique_ptr<PermissionInfobarDelegate> delegate)
+    std::unique_ptr<PermissionInfoBarDelegate> delegate)
     : ConfirmInfoBar(std::move(delegate)) {}
 
 PermissionInfoBar::~PermissionInfoBar() = default;
 
-PermissionInfobarDelegate* PermissionInfoBar::GetDelegate() {
-  return delegate()->AsPermissionInfobarDelegate();
+PermissionInfoBarDelegate* PermissionInfoBar::GetDelegate() {
+  return delegate()->AsPermissionInfoBarDelegate();
 }
 
 ScopedJavaLocalRef<jobject> PermissionInfoBar::CreateRenderInfoBar(
     JNIEnv* env) {
   ScopedJavaLocalRef<jstring> ok_button_text =
       base::android::ConvertUTF16ToJavaString(
-          env, GetTextFor(PermissionInfobarDelegate::BUTTON_OK));
+          env, GetTextFor(PermissionInfoBarDelegate::BUTTON_OK));
   ScopedJavaLocalRef<jstring> cancel_button_text =
       base::android::ConvertUTF16ToJavaString(
-          env, GetTextFor(PermissionInfobarDelegate::BUTTON_CANCEL));
-  PermissionInfobarDelegate* delegate = GetDelegate();
+          env, GetTextFor(PermissionInfoBarDelegate::BUTTON_CANCEL));
+  PermissionInfoBarDelegate* delegate = GetDelegate();
   ScopedJavaLocalRef<jstring> message_text =
       base::android::ConvertUTF16ToJavaString(env, delegate->GetMessageText());
   ScopedJavaLocalRef<jstring> link_text =
@@ -55,7 +55,7 @@ ScopedJavaLocalRef<jobject> PermissionInfoBar::CreateRenderInfoBar(
     java_bitmap = gfx::ConvertToJavaBitmap(delegate->GetIcon().ToSkBitmap());
   }
 
-  std::vector<int> content_settings{delegate->content_setting()};
+  std::vector<int> content_settings{delegate->GetContentSettingType(0)};
 
   return Java_PermissionInfoBar_create(
       env, GetWindowAndroid().obj(), GetEnumeratedIconId(), java_bitmap.obj(),
@@ -68,7 +68,7 @@ ScopedJavaLocalRef<jobject> PermissionInfoBar::CreateRenderInfoBar(
 void PermissionInfoBar::ProcessButton(int action) {
   // Check if the delegate asked us to display a persistence toggle. If so,
   // inform it of the toggle state.
-  PermissionInfobarDelegate* delegate = GetDelegate();
+  PermissionInfoBarDelegate* delegate = GetDelegate();
   if (delegate->ShouldShowPersistenceToggle()) {
     delegate->set_persist(Java_PermissionInfoBar_isPersistSwitchOn(
         base::android::AttachCurrentThread(), GetJavaInfoBar()));