[Android] Explicitly request all needed runtime permissions.

chrome/browser/media/webrtc/media_stream_devices_controller.cc

Index: chrome/browser/media/webrtc/media_stream_devices_controller.cc
diff --git a/chrome/browser/media/webrtc/media_stream_devices_controller.cc b/chrome/browser/media/webrtc/media_stream_devices_controller.cc
index 7801ea48c8d43189e9065fed009291d1594b8b3f..33f5dbec723ac3327fd6a8cf27e6ceec89e98b46 100644
--- a/chrome/browser/media/webrtc/media_stream_devices_controller.cc
+++ b/chrome/browser/media/webrtc/media_stream_devices_controller.cc
@@ -611,16 +611,15 @@ bool MediaStreamDevicesController::IsUserAcceptAllowed(
   if (!window_android)
     return false;
 
-  std::string android_permission =
-      PrefServiceBridge::GetAndroidPermissionForContentSetting(content_type);
-  bool android_permission_blocked = false;
-  if (!android_permission.empty()) {
-    android_permission_blocked =
-        !window_android->HasPermission(android_permission) &&
-        !window_android->CanRequestPermission(android_permission);
+  std::vector<std::string> android_permissions;
+  PrefServiceBridge::GetAndroidPermissionsForContentSetting(
+      content_type, &android_permissions);
+  for (std::string android_permission : android_permissions) {

[tommi (sloooow) - chröme, 2017/02/16 21:42:04]

please change to |const std::string& android_permission|
(otherwise you create one more copy of the strings)

alternatively you can use auto:

for (const auto& permission : android_permissions) {
...

[Ted C, 2017/02/17 21:36:52]

Done.

+    if (!window_android->HasPermission(android_permission) &&
+        !window_android->CanRequestPermission(android_permission)) {
+      return false;
+    }
   }
-  if (android_permission_blocked)
-    return false;
 
   // Don't approve device requests if the tab was hidden.
   // TODO(qinmin): Add a test for this. http://crbug.com/396869.