📱 Simplify naming of generated java enums IntDefs

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

Index: chrome/android/java/src/org/chromium/chrome/browser/ntp/cards/SuggestionsCategoryInfo.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ntp/cards/SuggestionsCategoryInfo.java b/chrome/android/java/src/org/chromium/chrome/browser/ntp/cards/SuggestionsCategoryInfo.java
index 35dc3439e1c0d03a20504bef345581b56dcd8ffa..c2fb5599db3cbeb1f7a0c8757549c80069e8980f 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/ntp/cards/SuggestionsCategoryInfo.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/ntp/cards/SuggestionsCategoryInfo.java
@@ -8,9 +8,9 @@
 import org.chromium.chrome.browser.ntp.ContextMenuManager;
 import org.chromium.chrome.browser.ntp.ContextMenuManager.ContextMenuItemId;
 import org.chromium.chrome.browser.ntp.snippets.CategoryInt;
-import org.chromium.chrome.browser.ntp.snippets.ContentSuggestionsCardLayout.ContentSuggestionsCardLayoutEnum;
+import org.chromium.chrome.browser.ntp.snippets.ContentSuggestionsCardLayout;
 import org.chromium.chrome.browser.ntp.snippets.KnownCategories;
-import org.chromium.chrome.browser.suggestions.ContentSuggestionsAdditionalAction.ContentSuggestionsAdditionalActionEnum;
+import org.chromium.chrome.browser.suggestions.ContentSuggestionsAdditionalAction;
 import org.chromium.chrome.browser.suggestions.SuggestionsNavigationDelegate;
 
 import javax.annotation.Nullable;
@@ -36,15 +36,15 @@
     /**
      * Layout of the cards to be used to display suggestions in this category.
      */
-    @ContentSuggestionsCardLayoutEnum
+    @ContentSuggestionsCardLayout
     private final int mCardLayout;
 
     /**
      * The type of additional action supported by the category, or
-     * {@link ContentSuggestionsAdditionalActionEnum#NONE} if no such action is supported.
+     * {@link ContentSuggestionsAdditionalAction#NONE} if no such action is supported.
      * @see ActionItem
      */
-    @ContentSuggestionsAdditionalActionEnum
+    @ContentSuggestionsAdditionalAction
     private final int mAdditionalAction;
 
     /** Whether this category should be shown if it offers no suggestions. */
@@ -56,8 +56,8 @@
     private final String mNoSuggestionsMessage;
 
     public SuggestionsCategoryInfo(@CategoryInt int category, String title,
-            @ContentSuggestionsCardLayoutEnum int cardLayout,
-            @ContentSuggestionsAdditionalActionEnum int additionalAction, boolean showIfEmpty,
+            @ContentSuggestionsCardLayout int cardLayout,
+            @ContentSuggestionsAdditionalAction int additionalAction, boolean showIfEmpty,
             String noSuggestionsMessage) {
         mCategory = category;
         mTitle = title;
@@ -76,12 +76,12 @@ public int getCategory() {
         return mCategory;
     }
 
-    @ContentSuggestionsCardLayoutEnum
+    @ContentSuggestionsCardLayout
     public int getCardLayout() {
         return mCardLayout;
     }
 
-    @ContentSuggestionsAdditionalActionEnum
+    @ContentSuggestionsAdditionalAction
     public int getAdditionalAction() {
         return mAdditionalAction;
     }