📱 Simplify naming of generated java enums IntDefs

chrome/android/junit/src/org/chromium/chrome/browser/ntp/cards/SuggestionsSectionTest.java

 // Copyright 2016 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.ntp.cards;
 
 import static org.hamcrest.Matchers.is;
 import static org.hamcrest.collection.IsIterableContainingInOrder.contains;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
@@ skipping 28 matching lines @@
 
 import org.chromium.base.Callback;
 import org.chromium.base.test.util.Feature;
 import org.chromium.chrome.browser.DisableHistogramsRule;
 import org.chromium.chrome.browser.ntp.cards.NewTabPageViewHolder.UpdateLayoutParamsCallback;
 import org.chromium.chrome.browser.ntp.snippets.CategoryStatus;
 import org.chromium.chrome.browser.ntp.snippets.SnippetArticle;
 import org.chromium.chrome.browser.ntp.snippets.SuggestionsSource;
 import org.chromium.chrome.browser.offlinepages.OfflinePageItem;
 import org.chromium.chrome.browser.suggestions.ContentSuggestionsAdditionalAction;
-import org.chromium.chrome.browser.suggestions.ContentSuggestionsAdditionalAction.ContentSuggestionsAdditionalActionEnum;
 import org.chromium.chrome.browser.suggestions.SuggestionsMetricsReporter;
 import org.chromium.chrome.browser.suggestions.SuggestionsNavigationDelegate;
 import org.chromium.chrome.browser.suggestions.SuggestionsRanker;
 import org.chromium.chrome.browser.suggestions.SuggestionsUiDelegate;
 import org.chromium.chrome.test.util.browser.suggestions.ContentSuggestionsTestUtils.CategoryInfoBuilder;
 import org.chromium.testing.local.LocalRobolectricTestRunner;
 
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
@@ skipping 678 matching lines @@
                 mDelegate, mUiDelegate, mock(SuggestionsRanker.class), mBridge, info);
         section.setParent(mParent);
         return section;
     }
 
     private OfflinePageItem createOfflinePageItem(String url, long offlineId) {
         return new OfflinePageItem(url, offlineId, "", "", "", 0, 0, 0, 0);
     }
 
     private static void verifyAction(
-            SuggestionsSection section, @ContentSuggestionsAdditionalActionEnum int action) {
+            SuggestionsSection section, @ContentSuggestionsAdditionalAction int action) {
         SuggestionsSource suggestionsSource = mock(SuggestionsSource.class);
         SuggestionsUiDelegate manager = mock(SuggestionsUiDelegate.class);
         SuggestionsNavigationDelegate navDelegate = mock(SuggestionsNavigationDelegate.class);
         when(manager.getSuggestionsSource()).thenReturn(suggestionsSource);
         when(manager.getNavigationDelegate()).thenReturn(navDelegate);
         when(manager.getMetricsReporter()).thenReturn(mock(SuggestionsMetricsReporter.class));
 
         if (action != ContentSuggestionsAdditionalAction.NONE) {
             section.getActionItemForTesting().performAction(manager);
         }
 
         verify(section.getCategoryInfo(),
                 (action == ContentSuggestionsAdditionalAction.VIEW_ALL ? times(1) : never()))
                 .performViewAllAction(navDelegate);
         verify(suggestionsSource,
                 (action == ContentSuggestionsAdditionalAction.FETCH ? times(1) : never()))
                 .fetchSuggestions(anyInt(), any(String[].class));
     }
 
     private static void verifySnippets(SuggestionsSection section, List<SnippetArticle> snippets) {
         assertEquals(snippets.size(), section.getSuggestionsCount());
         // Indices in section are off-by-one (index 0 is the header).
         int index = 1;
         for (SnippetArticle snippet : snippets) {
             assertEquals(snippet, section.getSuggestionAt(index++));
         }
     }
 }