Decouple MediaStreamInfoBarDelegate from GroupedPermissionInfoBarDelegate

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

 // Copyright 2016 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/ui/android/infobars/permission_infobar.h"
 
 #include <memory>
 #include <utility>
 #include <vector>
 
@@ skipping 37 matching lines @@
       base::android::ConvertUTF16ToJavaString(env, delegate->GetMessageText());
   ScopedJavaLocalRef<jstring> link_text =
       base::android::ConvertUTF16ToJavaString(env, delegate->GetLinkText());
 
   ScopedJavaLocalRef<jobject> java_bitmap;
   if (delegate->GetIconId() == infobars::InfoBarDelegate::kNoIconID &&
       !delegate->GetIcon().IsEmpty()) {
     java_bitmap = gfx::ConvertToJavaBitmap(delegate->GetIcon().ToSkBitmap());
   }
 
-  std::vector<int> content_settings{delegate->content_setting()};
+  std::vector<int> content_settings{delegate->content_settings()};
 
   return Java_PermissionInfoBar_create(
       env, GetWindowAndroid().obj(), GetEnumeratedIconId(), java_bitmap.obj(),
       message_text.obj(), link_text.obj(), ok_button_text.obj(),
       cancel_button_text.obj(),
       base::android::ToJavaIntArray(env, content_settings).obj(),
       delegate->ShouldShowPersistenceToggle());
 }
 
 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();
   if (delegate->ShouldShowPersistenceToggle()) {
     delegate->set_persist(Java_PermissionInfoBar_isPersistSwitchOn(
         base::android::AttachCurrentThread(), GetJavaInfoBar()));
   }
 
   ConfirmInfoBar::ProcessButton(action);
 }