[Android] Explicitly request all needed runtime permissions.

chrome/browser/permissions/permission_update_infobar_delegate_android.cc

Index: chrome/browser/permissions/permission_update_infobar_delegate_android.cc
diff --git a/chrome/browser/permissions/permission_update_infobar_delegate_android.cc b/chrome/browser/permissions/permission_update_infobar_delegate_android.cc
index 47fb590c393f5de48f6fa46799597e5cdd370020..4587a69e9214c97cfb9b475d283decafa99cc6dd 100644
--- a/chrome/browser/permissions/permission_update_infobar_delegate_android.cc
+++ b/chrome/browser/permissions/permission_update_infobar_delegate_android.cc
@@ -36,16 +36,28 @@ infobars::InfoBar* PermissionUpdateInfoBarDelegate::Create(
   ui::WindowAndroid* window_android = cvc->GetWindowAndroid();
 
   std::vector<std::string> permissions;
+  int missing_permission_count = 0;
   int message_id = IDS_INFOBAR_MISSING_MULTIPLE_PERMISSIONS_TEXT;
 
   for (ContentSettingsType content_settings_type : content_settings_types) {
-    std::string android_permission =
-        PrefServiceBridge::GetAndroidPermissionForContentSetting(
-            content_settings_type);
-
-    if (!android_permission.empty() &&
-        !window_android->HasPermission(android_permission)) {
-      permissions.push_back(android_permission);
+    int previous_size = permissions.size();
+    PrefServiceBridge::GetAndroidPermissionsForContentSetting(
+        content_settings_type, &permissions);
+
+    if (missing_permission_count > 1)
+      continue;
+
+    for (auto it = permissions.begin() + previous_size;
+         it != permissions.end();
+         ++it) {
+      if (window_android->HasPermission(*it))
+        continue;
+
+      missing_permission_count++;
+      if (missing_permission_count > 1) {
+        message_id = IDS_INFOBAR_MISSING_MULTIPLE_PERMISSIONS_TEXT;
+        break;

[mlamouri (slow - plz ping), 2017/02/13 11:58:01]

nit: you could integrate this with the other conditions by doing an `else if`.

[Ted C, 2017/02/14 00:53:34]

Done.

+      }

[mlamouri (slow - plz ping), 2017/02/13 11:58:01]

Here, if I understand correctly, you want to double-break, right? Because you
will go back at the beginning of the for loop and `continue` up to the end. I'm
not sure if I understand this correctly but in that case, would it make sense to
`break` after the inner-for to you leave the outer-for and return properly? I've
heard `goto` can help sometimes too :)

[Ted C, 2017/02/14 00:53:34]

Yeah, this is a bit confusing, but it is actually doing what I want here.

The GetAndroidPermissionsForContentSetting above is collecting all the
permissions to request from Android, but the inner loop is just figuring out the
message id to show to the user.

Once there are multiple missing permissions, the inner loop is unnecessary but
the out loop will still collect any and all permissions until all content
settings are visited.

 
       if (content_settings_type == CONTENT_SETTINGS_TYPE_GEOLOCATION) {
           message_id = IDS_INFOBAR_MISSING_LOCATION_PERMISSION_TEXT;
@@ -61,8 +73,6 @@ infobars::InfoBar* PermissionUpdateInfoBarDelegate::Create(
       }
     }
   }
-  if (permissions.size() > 1)
-    message_id = IDS_INFOBAR_MISSING_MULTIPLE_PERMISSIONS_TEXT;
 
   return PermissionUpdateInfoBarDelegate::Create(
       web_contents, permissions, message_id, callback);
@@ -101,13 +111,13 @@ bool PermissionUpdateInfoBarDelegate::ShouldShowPermissionInfobar(
   ui::WindowAndroid* window_android = cvc->GetWindowAndroid();
 
   for (ContentSettingsType content_settings_type : content_settings_types) {
-    std::string android_permission =
-        PrefServiceBridge::GetAndroidPermissionForContentSetting(
-            content_settings_type);
+    std::vector<std::string> android_permissions;
+    PrefServiceBridge::GetAndroidPermissionsForContentSetting(
+        content_settings_type, &android_permissions);
 
-    if (!android_permission.empty() &&
-        !window_android->HasPermission(android_permission)) {
-      return true;
+    for (auto android_permission : android_permissions) {
+      if (!window_android->HasPermission(android_permission))
+        return true;
     }
   }