📱 Simplify naming of generated java enums IntDefs

chrome/test/android/javatests/src/org/chromium/chrome/test/util/browser/suggestions/ContentSuggestionsTestUtils.java

Index: chrome/test/android/javatests/src/org/chromium/chrome/test/util/browser/suggestions/ContentSuggestionsTestUtils.java
diff --git a/chrome/test/android/javatests/src/org/chromium/chrome/test/util/browser/suggestions/ContentSuggestionsTestUtils.java b/chrome/test/android/javatests/src/org/chromium/chrome/test/util/browser/suggestions/ContentSuggestionsTestUtils.java
index ba309d3fda4e6351403418f2bed0ebe020e7cb3e..b751ddf27af202534385859a3f8913dea08c15f6 100644
--- a/chrome/test/android/javatests/src/org/chromium/chrome/test/util/browser/suggestions/ContentSuggestionsTestUtils.java
+++ b/chrome/test/android/javatests/src/org/chromium/chrome/test/util/browser/suggestions/ContentSuggestionsTestUtils.java
@@ -10,10 +10,8 @@
 import org.chromium.chrome.browser.ntp.snippets.CategoryInt;
 import org.chromium.chrome.browser.ntp.snippets.CategoryStatus;
 import org.chromium.chrome.browser.ntp.snippets.ContentSuggestionsCardLayout;
-import org.chromium.chrome.browser.ntp.snippets.ContentSuggestionsCardLayout.ContentSuggestionsCardLayoutEnum;
 import org.chromium.chrome.browser.ntp.snippets.SnippetArticle;
 import org.chromium.chrome.browser.suggestions.ContentSuggestionsAdditionalAction;
-import org.chromium.chrome.browser.suggestions.ContentSuggestionsAdditionalAction.ContentSuggestionsAdditionalActionEnum;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -108,14 +106,14 @@ public static String viewTypeToString(@ItemViewType int viewType) {
         private boolean mShowIfEmpty;
         private String mTitle = "";
         private String mNoSuggestionsMessage = "";
-        @ContentSuggestionsCardLayoutEnum
+        @ContentSuggestionsCardLayout
         private int mCardLayout = ContentSuggestionsCardLayout.FULL_CARD;
 
         public CategoryInfoBuilder(@CategoryInt int category) {
             mCategory = category;
         }
 
-        public CategoryInfoBuilder withAction(@ContentSuggestionsAdditionalActionEnum int action) {
+        public CategoryInfoBuilder withAction(@ContentSuggestionsAdditionalAction int action) {
             mAdditionalAction = action;
             return this;
         }
@@ -134,8 +132,7 @@ public CategoryInfoBuilder withNoSuggestionsMessage(String message) {
             return this;
         }
 
-        public CategoryInfoBuilder withCardLayout(
-                @ContentSuggestionsCardLayoutEnum int cardLayout) {
+        public CategoryInfoBuilder withCardLayout(@ContentSuggestionsCardLayout int cardLayout) {
             mCardLayout = cardLayout;
             return this;
         }