[Android] Explicitly request all needed runtime permissions.

chrome/browser/permissions/permission_update_infobar_delegate_android.cc

 // Copyright 2015 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/permissions/permission_update_infobar_delegate_android.h"
 
 #include <memory>
 
 #include "base/android/jni_array.h"
 #include "base/callback_helpers.h"
@@ skipping 21 matching lines @@
       << "infobar.";
 
   content::ContentViewCore* cvc =
       content::ContentViewCore::FromWebContents(web_contents);
   ui::WindowAndroid* window_android = cvc->GetWindowAndroid();
 
   std::vector<std::string> permissions;
   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);
+    int previous_size = permissions.size();
+    PrefServiceBridge::GetAndroidPermissionsForContentSetting(
+        content_settings_type, &permissions);
 
-    if (!android_permission.empty() &&
-        !window_android->HasPermission(android_permission)) {
-      permissions.push_back(android_permission);
-
-      if (content_settings_type == CONTENT_SETTINGS_TYPE_GEOLOCATION) {
-          message_id = IDS_INFOBAR_MISSING_LOCATION_PERMISSION_TEXT;
-      } else if (content_settings_type ==
-                 CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC) {
-          message_id = IDS_INFOBAR_MISSING_MICROPHONE_PERMISSION_TEXT;
-      } else if (content_settings_type ==
-                 CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA) {
-          message_id = IDS_INFOBAR_MISSING_CAMERA_PERMISSION_TEXT;
-      } else {
-          NOTREACHED();
-          message_id = IDS_INFOBAR_MISSING_MULTIPLE_PERMISSIONS_TEXT;
+    for (auto it = permissions.begin() + previous_size;
+         it != permissions.end();
+         ++it) {
+      if (!window_android->HasPermission(*it)) {

[mlamouri (slow - plz ping), 2017/02/10 14:09:04]

style/nit:
```
if (window_android->HasPermission(*it))
  continue;
```

[Ted C, 2017/02/10 17:24:46]

Done.

+        if (content_settings_type == CONTENT_SETTINGS_TYPE_GEOLOCATION) {
+            message_id = IDS_INFOBAR_MISSING_LOCATION_PERMISSION_TEXT;
+        } else if (content_settings_type ==
+                   CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC) {
+            message_id = IDS_INFOBAR_MISSING_MICROPHONE_PERMISSION_TEXT;
+        } else if (content_settings_type ==
+                   CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA) {
+            message_id = IDS_INFOBAR_MISSING_CAMERA_PERMISSION_TEXT;
+        } else {
+            NOTREACHED();
+            message_id = IDS_INFOBAR_MISSING_MULTIPLE_PERMISSIONS_TEXT;
+        }

[mlamouri (slow - plz ping), 2017/02/10 14:09:04]

This is a bit confusing: we write a `message_id` by iterating trough the
`permissions` but then, there is: `if (permissions.size() > 1) message_id =
...`. Should we do that check first and only check the permissions otherwise?

[Ted C, 2017/02/10 17:24:46]

Definitely right.  Moved it around a bit to exit early if the missing
permissions
are greater than 1.  Still need to do the outer loop to gather all permissions,
but the inner loop can be skipped in that case.

       }
     }
   }
   if (permissions.size() > 1)
     message_id = IDS_INFOBAR_MISSING_MULTIPLE_PERMISSIONS_TEXT;
 
   return PermissionUpdateInfoBarDelegate::Create(
       web_contents, permissions, message_id, callback);
 }
 
@@ skipping 23 matching lines @@
   if (!web_contents)
     return false;
 
   content::ContentViewCore* cvc =
       content::ContentViewCore::FromWebContents(web_contents);
   if (!cvc || !cvc->GetWindowAndroid())
     return false;
   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;
     }
   }
 
   return false;
 }
 
 // static
 bool PermissionUpdateInfoBarDelegate::RegisterPermissionUpdateInfoBarDelegate(
     JNIEnv* env) {
   return RegisterNativesImpl(env);
@@ skipping 57 matching lines @@
 }
 
 bool PermissionUpdateInfoBarDelegate::Cancel() {
   base::ResetAndReturn(&callback_).Run(false);
   return true;
 }
 
 void PermissionUpdateInfoBarDelegate::InfoBarDismissed() {
   base::ResetAndReturn(&callback_).Run(false);
 }