📱 Simplify naming of generated java enums IntDefs

chrome/android/java/src/org/chromium/chrome/browser/ntp/cards/SectionList.java

Index: chrome/android/java/src/org/chromium/chrome/browser/ntp/cards/SectionList.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ntp/cards/SectionList.java b/chrome/android/java/src/org/chromium/chrome/browser/ntp/cards/SectionList.java
index 477326f1b326579b56a31250464db1f69f42111b..fe140cb4aa4e798816b2901439dd3fa9e64b8215 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/ntp/cards/SectionList.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/ntp/cards/SectionList.java
@@ -8,7 +8,6 @@
 import org.chromium.base.VisibleForTesting;
 import org.chromium.chrome.browser.ntp.snippets.CategoryInt;
 import org.chromium.chrome.browser.ntp.snippets.CategoryStatus;
-import org.chromium.chrome.browser.ntp.snippets.CategoryStatus.CategoryStatusEnum;
 import org.chromium.chrome.browser.ntp.snippets.KnownCategories;
 import org.chromium.chrome.browser.ntp.snippets.SnippetArticle;
 import org.chromium.chrome.browser.ntp.snippets.SnippetsBridge;
@@ -89,7 +88,7 @@ private void resetSections(boolean alwaysAllowEmptySections) {
      *     they are empty, even when they are normally not.
      * @return The number of suggestions for the section.
      */
-    private int resetSection(@CategoryInt int category, @CategoryStatusEnum int categoryStatus,
+    private int resetSection(@CategoryInt int category, @CategoryStatus int categoryStatus,
             boolean alwaysAllowEmptySections) {
         SuggestionsSource suggestionsSource = mUiDelegate.getSuggestionsSource();
         List<SnippetArticle> suggestions = suggestionsSource.getSuggestionsForCategory(category);
@@ -120,7 +119,7 @@ private int resetSection(@CategoryInt int category, @CategoryStatusEnum int cate
 
     @Override
     public void onNewSuggestions(@CategoryInt int category) {
-        @CategoryStatusEnum
+        @CategoryStatus
         int status = mUiDelegate.getSuggestionsSource().getCategoryStatus(category);
 
         if (!canLoadSuggestions(category, status)) return;
@@ -138,7 +137,7 @@ public void onNewSuggestions(@CategoryInt int category) {
 
     @Override
     public void onMoreSuggestions(@CategoryInt int category, List<SnippetArticle> suggestions) {
-        @CategoryStatusEnum
+        @CategoryStatus
         int status = mUiDelegate.getSuggestionsSource().getCategoryStatus(category);
         if (!canLoadSuggestions(category, status)) return;
 
@@ -146,7 +145,7 @@ public void onMoreSuggestions(@CategoryInt int category, List<SnippetArticle> su
     }
 
     @Override
-    public void onCategoryStatusChanged(@CategoryInt int category, @CategoryStatusEnum int status) {
+    public void onCategoryStatusChanged(@CategoryInt int category, @CategoryStatus int status) {
         // Observers should not be registered for this state.
         assert status != CategoryStatus.ALL_SUGGESTIONS_EXPLICITLY_DISABLED;
 
@@ -201,11 +200,11 @@ public void refreshSuggestions() {
      * If false, {@code suggestions} are appended to current list of suggestions.
      */
     private void setSuggestions(@CategoryInt int category, List<SnippetArticle> suggestions,
-            @CategoryStatusEnum int status, boolean replaceExisting) {
+            @CategoryStatus int status, boolean replaceExisting) {
         mSections.get(category).setSuggestions(suggestions, status, replaceExisting);
     }
 
-    private boolean canLoadSuggestions(@CategoryInt int category, @CategoryStatusEnum int status) {
+    private boolean canLoadSuggestions(@CategoryInt int category, @CategoryStatus int status) {
         // We never want to add suggestions from unknown categories.
         if (!mSections.containsKey(category)) return false;