Use PermissionType instead of ContentSettingsType in Android permission infobars

chrome/browser/ui/android/infobars/grouped_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/grouped_permission_infobar.h"
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_array.h"
 #include "base/android/jni_string.h"
 #include "chrome/browser/android/resource_mapper.h"
@@ skipping 43 matching lines @@
           env, delegate->GetMessageText());
   base::android::ScopedJavaLocalRef<jstring> ok_button_text =
       base::android::ConvertUTF16ToJavaString(
           env, GetTextFor(ConfirmInfoBarDelegate::BUTTON_OK));
   base::android::ScopedJavaLocalRef<jstring> cancel_button_text =
       base::android::ConvertUTF16ToJavaString(
           env, GetTextFor(ConfirmInfoBarDelegate::BUTTON_CANCEL));
 
   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());
 }
 
 void GroupedPermissionInfoBar::SetJavaInfoBar(
     const base::android::JavaRef<jobject>& java_info_bar) {
   InfoBarAndroid::SetJavaInfoBar(java_info_bar);
   JNIEnv* env = base::android::AttachCurrentThread();
   Java_GroupedPermissionInfoBar_setNativePtr(env, java_info_bar,
                                              reinterpret_cast<intptr_t>(this));
 }
 
 GroupedPermissionInfoBarDelegate* GroupedPermissionInfoBar::GetDelegate() {
   return static_cast<GroupedPermissionInfoBarDelegate*>(delegate());
 }