Use PermissionType instead of ContentSettingsType in Android permission infobars

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

Index: chrome/browser/ui/android/infobars/grouped_permission_infobar.cc
diff --git a/chrome/browser/ui/android/infobars/grouped_permission_infobar.cc b/chrome/browser/ui/android/infobars/grouped_permission_infobar.cc
index 5c8afd1db2543e749a7ea43b567fdfc596df7492..ada1e1c91f110341e438b1ae721c7c827f8817c9 100644
--- a/chrome/browser/ui/android/infobars/grouped_permission_infobar.cc
+++ b/chrome/browser/ui/android/infobars/grouped_permission_infobar.cc
@@ -61,21 +61,21 @@ GroupedPermissionInfoBar::CreateRenderInfoBar(JNIEnv* env) {
 
   std::vector<base::string16> permission_strings;
   std::vector<int> permission_icons;
-  std::vector<int> content_settings_types;
+  std::vector<int> permission_types;
 
   for (size_t i = 0; i < delegate->permission_count(); i++) {
     permission_strings.push_back(delegate->GetMessageTextFragment(i));
     permission_icons.push_back(
         ResourceMapper::MapFromChromiumId(delegate->GetIconIdForPermission(i)));
-    content_settings_types.push_back(delegate->GetContentSettingType(i));
+    permission_types.push_back(
+        static_cast<int>(delegate->GetPermissionType(i)));
   }
 
   return Java_GroupedPermissionInfoBar_create(
       env, message_text, ok_button_text, cancel_button_text,
       base::android::ToJavaIntArray(env, permission_icons),
       base::android::ToJavaArrayOfStrings(env, permission_strings),
-      GetWindowAndroid(),
-      base::android::ToJavaIntArray(env, content_settings_types),
+      GetWindowAndroid(), base::android::ToJavaIntArray(env, permission_types),
       delegate->ShouldShowPersistenceToggle());
 }