Use PermissionType instead of ContentSettingsType in Android permission infobars

chrome/android/java/src/org/chromium/chrome/browser/preferences/PrefServiceBridge.java

 // Copyright 2014 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.
 
 package org.chromium.chrome.browser.preferences;
 
 import android.content.Context;
 import android.content.SharedPreferences;
 import android.util.Log;
 
 import org.chromium.base.ContextUtils;
 import org.chromium.base.ThreadUtils;
 import org.chromium.base.VisibleForTesting;
 import org.chromium.base.annotations.CalledByNative;
 import org.chromium.chrome.browser.ContentSettingsType;
+import org.chromium.chrome.browser.PermissionType;
 import org.chromium.chrome.browser.preferences.website.ContentSetting;
 import org.chromium.chrome.browser.preferences.website.ContentSettingException;
 import org.chromium.chrome.browser.preferences.website.GeolocationInfo;
 import org.chromium.chrome.browser.preferences.website.WebsitePreferenceBridge;
 import org.chromium.chrome.browser.search_engines.TemplateUrlService;
 
 import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ skipping 208 matching lines @@
                 contentSettingsType, pattern, ContentSetting.fromInt(contentSetting), source);
         list.add(exception);
     }
 
     /**
      * Return the android permission string for a given {@link ContentSettingsType}.  If there
      * is no corresponding permission, then null will be returned.
      *
      * @param contentSettingType The content setting to get the android permission for.
      * @return The android permission for the given content setting.
+     *
+     * TODO(lshang): Remove this and migrate all call sites to use
+     * getAndroidPermissionForPermissionType() below, which takes PermissionType instead of
+     * ContentSettingsType.
      */
     @CalledByNative
     public static String getAndroidPermissionForContentSetting(int contentSettingType) {

[raymes, 2016/10/17 01:11:12]

Hmm it would be good to remove this asap. Besides the duplicated code, we don't
have any type checking and I would be worried that people would use the wrong
one and get the wrong result. Could you please file a bug and note it in the
comment? 

We can also get thoughts from the android OWNERS. Ideally I'd just like to
remove ContentSettingsType from the code altogether.

         if (contentSettingType == ContentSettingsType.CONTENT_SETTINGS_TYPE_GEOLOCATION) {
             return android.Manifest.permission.ACCESS_FINE_LOCATION;
         }
         if (contentSettingType == ContentSettingsType.CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC) {
             return android.Manifest.permission.RECORD_AUDIO;
         }
         if (contentSettingType == ContentSettingsType.CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA) {
             return android.Manifest.permission.CAMERA;
         }
         return null;
     }
 
     /**
+     * Return the android permission string for a given {@link PermissionType}.  If there
+     * is no corresponding permission, then null will be returned.
+     *
+     * @param permissionType The content setting to get the android permission for.
+     * @return The android permission for the given content setting.
+     */
+    public static String getAndroidPermissionForPermissionType(int permissionType) {
+        if (permissionType == PermissionType.GEOLOCATION) {
+            return android.Manifest.permission.ACCESS_FINE_LOCATION;
+        }
+        if (permissionType == PermissionType.AUDIO_CAPTURE) {
+            return android.Manifest.permission.RECORD_AUDIO;
+        }
+        if (permissionType == PermissionType.VIDEO_CAPTURE) {
+            return android.Manifest.permission.CAMERA;
+        }
+        return null;
+    }
+
+    /**
      * @return whether autoplay is enabled.
      */
     public boolean isAutoplayEnabled() {
         return nativeGetAutoplayEnabled();
     }
 
     public boolean isAcceptCookiesEnabled() {
         return nativeGetAcceptCookiesEnabled();
     }
 
@@ skipping 892 matching lines @@
     private native String nativeGetSupervisedUserSecondCustodianProfileImageURL();
     private native boolean nativeIsMetricsReportingEnabled();
     private native void nativeSetMetricsReportingEnabled(boolean enabled);
     private native boolean nativeIsMetricsReportingManaged();
     private native void nativeSetClickedUpdateMenuItem(boolean clicked);
     private native boolean nativeGetClickedUpdateMenuItem();
     private native void nativeSetLatestVersionWhenClickedUpdateMenuItem(String version);
     private native String nativeGetLatestVersionWhenClickedUpdateMenuItem();
     private native void nativeSetSupervisedUserId(String supervisedUserId);
 }