📱 Simplify naming of generated java enums IntDefs

chrome/test/android/javatests/src/org/chromium/chrome/test/util/browser/suggestions/FakeSuggestionsSource.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.test.util.browser.suggestions;
 
 import android.graphics.Bitmap;
 
 import org.chromium.base.Callback;
 import org.chromium.base.ThreadUtils;
 import org.chromium.chrome.browser.ntp.cards.SuggestionsCategoryInfo;
 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.SnippetArticle;
 import org.chromium.chrome.browser.ntp.snippets.SnippetsBridge;
 import org.chromium.chrome.browser.ntp.snippets.SuggestionsSource;
 
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
@@ skipping 14 matching lines @@
 
     private final List<Integer> mDismissedCategories = new ArrayList<>();
     private final Map<Integer, List<SnippetArticle>> mDismissedCategorySuggestions =
             new HashMap<>();
     private final Map<Integer, Integer> mDismissedCategoryStatus = new LinkedHashMap<>();
     private final Map<Integer, SuggestionsCategoryInfo> mDismissedCategoryInfo = new HashMap<>();
 
     /**
      * Sets the status to be returned for a given category.
      */
-    public void setStatusForCategory(@CategoryInt int category, @CategoryStatusEnum int status) {
+    public void setStatusForCategory(@CategoryInt int category, @CategoryStatus int status) {
         mCategoryStatus.put(category, status);
         if (status == CategoryStatus.NOT_PROVIDED) {
             mCategories.remove(Integer.valueOf(category));
         } else if (!mCategories.contains(category)) {
             mCategories.add(category);
         }
         if (mObserver != null) mObserver.onCategoryStatusChanged(category, status);
     }
 
     /**
@@ skipping 127 matching lines @@
     }
 
     @Override
     public int[] getCategories() {
         int[] result = new int[mCategories.size()];
         int index = 0;
         for (int id : mCategories) result[index++] = id;
         return result;
     }
 
-    @CategoryStatusEnum
+    @CategoryStatus
     @Override
     public int getCategoryStatus(@CategoryInt int category) {
         return mCategoryStatus.get(category);
     }
 
     @Override
     public SuggestionsCategoryInfo getCategoryInfo(int category) {
         return mCategoryInfo.get(category);
     }
 
     @Override
     public List<SnippetArticle> getSuggestionsForCategory(int category) {
         if (!SnippetsBridge.isCategoryStatusAvailable(mCategoryStatus.get(category))) {
             return Collections.emptyList();
         }
         List<SnippetArticle> result = mSuggestions.get(category);
         return result == null ? Collections.<SnippetArticle>emptyList() : new ArrayList<>(result);
     }
 }