[Android] Explicitly request all needed runtime permissions.

chrome/browser/android/preferences/pref_service_bridge.h

Index: chrome/browser/android/preferences/pref_service_bridge.h
diff --git a/chrome/browser/android/preferences/pref_service_bridge.h b/chrome/browser/android/preferences/pref_service_bridge.h
index 656a0fece0d6ceaf990dffe96279d0912284badf..fac21f4726fcdd45fd7ec2433cd4d989696744af 100644
--- a/chrome/browser/android/preferences/pref_service_bridge.h
+++ b/chrome/browser/android/preferences/pref_service_bridge.h
@@ -7,6 +7,7 @@
 
 #include <jni.h>
 #include <string>
+#include <vector>
 
 #include "components/content_settings/core/common/content_settings.h"
 
@@ -22,10 +23,11 @@ class PrefServiceBridge {
       const std::string& locale,
       std::string* accept_languages);
 
-  // Return the corresponding Android permission associated with the
-  // ContentSettingsType specified (or an empty string if no permission exists).
-  static std::string GetAndroidPermissionForContentSetting(
-      ContentSettingsType content_type);
+  // Populate the list of corresponding Android permissions associated with the
+  // ContentSettingsType specified.
+  static void GetAndroidPermissionsForContentSetting(
+      ContentSettingsType content_type,
+      std::vector<std::string>* out);

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

just return the vector instead?

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

The permission update infobar accumulates the permissions for multiple content
settings, so it is easier to just build on an existing vector than creating a
new one and adding those back in (at least IMO).

 };
 
 #endif  // CHROME_BROWSER_ANDROID_PREFERENCES_PREF_SERVICE_BRIDGE_H_