Index: chrome/browser/android/preferences/pref_service_bridge.cc |
diff --git a/chrome/browser/android/preferences/pref_service_bridge.cc b/chrome/browser/android/preferences/pref_service_bridge.cc |
index 06b54efcf52f6c35050ee56da073ba79758d5989..41a98fc1f2cfd766da69471d031ba504253fcdb6 100644 |
--- a/chrome/browser/android/preferences/pref_service_bridge.cc |
+++ b/chrome/browser/android/preferences/pref_service_bridge.cc |
@@ -1221,16 +1221,15 @@ void PrefServiceBridge::PrependToAcceptLanguagesIfNecessary( |
} |
// static |
-std::string PrefServiceBridge::GetAndroidPermissionForContentSetting( |
- ContentSettingsType content_type) { |
+void PrefServiceBridge::GetAndroidPermissionsForContentSetting( |
+ ContentSettingsType content_type, std::vector<std::string>* out) { |
JNIEnv* env = AttachCurrentThread(); |
- base::android::ScopedJavaLocalRef<jstring> android_permission = |
- Java_PrefServiceBridge_getAndroidPermissionForContentSetting( |
- env, content_type); |
- if (android_permission.is_null()) |
- return std::string(); |
- |
- return ConvertJavaStringToUTF8(android_permission); |
+ base::android::AppendJavaStringArrayToStringVector( |
+ env, |
+ Java_PrefServiceBridge_getAndroidPermissionsForContentSetting( |
+ env, content_type) |
+ .obj(), |
+ out); |
} |
static void SetSupervisedUserId(JNIEnv* env, |