ClearBrowsingDataPreferences: Reorder DialogOption to match display order

Switching to multi-window mode on Android and back is messing up the
Clear Browsing Data dialog on Android after the display order was changed
to move "Media Licenses" up from the bottom. Changing DialogOption to match
the order displayed.

BUG=888943
TEST=tested manually using steps in the bug

Change-Id: Iabae3c0bdaf3098a740b6709c8527b892be6aff3
Reviewed-on: https://chromium-review.googlesource.com/1246594Reviewed-by: Christian Dullweber <dullweber@chromium.org>
Commit-Queue: John Rummell <jrummell@chromium.org>
Cr-Commit-Position: refs/heads/master@{#594787}

chrome/android/java/src/org/chromium/chrome/browser/preferences/privacy/ClearBrowsingDataPreferences.java

@@ -186,19 +186,20 @@ public abstract class ClearBrowsingDataPreferences extends PreferenceFragment
      * The various data types that can be cleared via this screen.
      */
     @IntDef({DialogOption.CLEAR_HISTORY, DialogOption.CLEAR_COOKIES_AND_SITE_DATA,
-            DialogOption.CLEAR_CACHE, DialogOption.CLEAR_PASSWORDS, DialogOption.CLEAR_FORM_DATA,
-            DialogOption.CLEAR_SITE_SETTINGS, DialogOption.CLEAR_MEDIA_LICENSES})
+            DialogOption.CLEAR_MEDIA_LICENSES, DialogOption.CLEAR_CACHE,
+            DialogOption.CLEAR_PASSWORDS, DialogOption.CLEAR_FORM_DATA,
+            DialogOption.CLEAR_SITE_SETTINGS})
     @Retention(RetentionPolicy.SOURCE)
     public @interface DialogOption {
         // Used for indexing. Should start from 0 and can't have gaps.
         // Lowest value is additionally used for starting "for" loop below.
         int CLEAR_HISTORY = 0;
         int CLEAR_COOKIES_AND_SITE_DATA = 1;
-        int CLEAR_CACHE = 2;
-        int CLEAR_PASSWORDS = 3;
-        int CLEAR_FORM_DATA = 4;
-        int CLEAR_SITE_SETTINGS = 5;
-        int CLEAR_MEDIA_LICENSES = 6;
+        int CLEAR_MEDIA_LICENSES = 2;
+        int CLEAR_CACHE = 3;
+        int CLEAR_PASSWORDS = 4;
+        int CLEAR_FORM_DATA = 5;
+        int CLEAR_SITE_SETTINGS = 6;
         int NUM_ENTRIES = 7;
     }
 
@@ -208,11 +209,11 @@ public abstract class ClearBrowsingDataPreferences extends PreferenceFragment
     private final static int[] DATA_TYPES = {
             BrowsingDataType.HISTORY, // DialogOption.CLEAR_HISTORY
             BrowsingDataType.COOKIES, // DialogOption.CLEAR_COOKIES_AND_SITE_DATA
+            BrowsingDataType.MEDIA_LICENSES, // DialogOption.CLEAR_MEDIA_LICENSES
             BrowsingDataType.CACHE, // DialogOption.CLEAR_CACHE
             BrowsingDataType.PASSWORDS, // DialogOption.CLEAR_PASSWORDS
             BrowsingDataType.FORM_DATA, // DialogOption.CLEAR_FORM_DATA
             BrowsingDataType.SITE_SETTINGS, // DialogOption.CLEAR_SITE_SETTINGS
-            BrowsingDataType.MEDIA_LICENSES, // DialogOption.CLEAR_MEDIA_LICENSES
     };
 
     /**
@@ -221,11 +222,11 @@ public abstract class ClearBrowsingDataPreferences extends PreferenceFragment
     private final static String[] PREFERENCE_KEYS = {
             "clear_history_checkbox", // DialogOption.CLEAR_HISTORY
             "clear_cookies_checkbox", // DialogOption_CLEAR_COOKIES_AND_SITE_DATA
+            "clear_media_licenses_checkbox", // DialogOption.CLEAR_MEDIA_LICENSES
             "clear_cache_checkbox", // DialogOption.CLEAR_CACHE
             "clear_passwords_checkbox", // DialogOption.CLEAR_PASSWORDS
             "clear_form_data_checkbox", // DialogOption.CLEAR_FORM_DATA
             "clear_site_settings_checkbox", // DialogOption.CLEAR_SITE_SETTINGS
-            "clear_media_licenses_checkbox", // DialogOption.CLEAR_MEDIA_LICENSES
     };
 
     /**
@@ -235,12 +236,12 @@ public abstract class ClearBrowsingDataPreferences extends PreferenceFragment
     private final static int[] ICONS = {
             R.drawable.ic_watch_later_24dp, // DialogOption.CLEAR_HISTORY
             R.drawable.permission_cookie, // DialogOption.CLEAR_COOKIES_AND_SITE_DATA
+            R.drawable.permission_protected_media, // DialogOption.CLEAR_MEDIA_LICENSES
             R.drawable.ic_collections_grey, // DialogOption.CLEAR_CACHE
             R.drawable.ic_vpn_key_grey, // DialogOption.CLEAR_PASSWORDS
             R.drawable.ic_edit_24dp, // DialogOption.CLEAR_FORM_DATA
             R.drawable
                     .ic_tv_options_input_settings_rotated_grey, // DialogOption.CLEAR_SITE_SETTINGS
-            R.drawable.permission_protected_media, // DialogOption.CLEAR_MEDIA_LICENSES
     };
 
     public static final String CLEAR_BROWSING_DATA_FETCHER = "clearBrowsingDataFetcher";

chrome/android/java/src/org/chromium/chrome/browser/preferences/privacy/ClearBrowsingDataPreferencesAdvanced.java

@@ -24,9 +24,9 @@ public class ClearBrowsingDataPreferencesAdvanced extends ClearBrowsingDataPrefe
     @Override
     protected List<Integer> getDialogOptions() {
         return Arrays.asList(DialogOption.CLEAR_HISTORY, DialogOption.CLEAR_COOKIES_AND_SITE_DATA,
-                DialogOption.CLEAR_CACHE, DialogOption.CLEAR_PASSWORDS,
-                DialogOption.CLEAR_FORM_DATA, DialogOption.CLEAR_SITE_SETTINGS,
-                DialogOption.CLEAR_MEDIA_LICENSES);
+                DialogOption.CLEAR_MEDIA_LICENSES, DialogOption.CLEAR_CACHE,
+                DialogOption.CLEAR_PASSWORDS, DialogOption.CLEAR_FORM_DATA,
+                DialogOption.CLEAR_SITE_SETTINGS);
     }
 
     @Override