Migrating offline item enums/@IntDef to NUM_ENTRIES

Before CL: there is no standard for enums handled by java_cpp_enum.py for saving number of entries and there is used COUNT, MAX and other names, which later are part of IntDef (Android code in the same time is using consistent NUM_ENTRIES).

After CL: OfflineItemFilter and OfflineItemState are using NUM_ENTRIES (for OfflineItemFilter there is also stripped prefix during conversion for Java).

BUG=919666

Change-Id: I2f83d4371f55db81e95565cfccfd8f5dcaad4211
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1583718Reviewed-by: Min Qin <qinmin@chromium.org>
Commit-Queue: Marcin Wiącek <marcin@mwiacek.com>
Cr-Commit-Position: refs/heads/master@{#654774}

chrome/android/java/src/org/chromium/chrome/browser/download/DownloadInfo.java

@@ -372,23 +372,23 @@ public final class DownloadInfo {
 
         switch (DownloadFilter.fromMimeType(downloadInfo.getMimeType())) {
             case DownloadFilter.Type.PAGE:
-                offlineItem.filter = OfflineItemFilter.FILTER_PAGE;
+                offlineItem.filter = OfflineItemFilter.PAGE;
                 break;
             case DownloadFilter.Type.VIDEO:
-                offlineItem.filter = OfflineItemFilter.FILTER_VIDEO;
+                offlineItem.filter = OfflineItemFilter.VIDEO;
                 break;
             case DownloadFilter.Type.AUDIO:
-                offlineItem.filter = OfflineItemFilter.FILTER_AUDIO;
+                offlineItem.filter = OfflineItemFilter.AUDIO;
                 break;
             case DownloadFilter.Type.IMAGE:
-                offlineItem.filter = OfflineItemFilter.FILTER_IMAGE;
+                offlineItem.filter = OfflineItemFilter.IMAGE;
                 break;
             case DownloadFilter.Type.DOCUMENT:
-                offlineItem.filter = OfflineItemFilter.FILTER_DOCUMENT;
+                offlineItem.filter = OfflineItemFilter.DOCUMENT;
                 break;
             case DownloadFilter.Type.OTHER:
             default:
-                offlineItem.filter = OfflineItemFilter.FILTER_OTHER;
+                offlineItem.filter = OfflineItemFilter.OTHER;
                 break;
         }
 

chrome/android/java/src/org/chromium/chrome/browser/download/home/filter/Filters.java

@@ -63,16 +63,16 @@ public class Filters {
      */
     public static @FilterType Integer fromOfflineItem(@OfflineItemFilter int filter) {
         switch (filter) {
-            case OfflineItemFilter.FILTER_PAGE:
+            case OfflineItemFilter.PAGE:
                 return FilterType.SITES;
-            case OfflineItemFilter.FILTER_VIDEO:
+            case OfflineItemFilter.VIDEO:
                 return FilterType.VIDEOS;
-            case OfflineItemFilter.FILTER_AUDIO:
+            case OfflineItemFilter.AUDIO:
                 return FilterType.MUSIC;
-            case OfflineItemFilter.FILTER_IMAGE:
+            case OfflineItemFilter.IMAGE:
                 return FilterType.IMAGES;
-            // case OfflineItemFilter.FILTER_OTHER
-            // case OfflineItemFilter.FILTER_DOCUMENT
+            // case OfflineItemFilter.OTHER
+            // case OfflineItemFilter.DOCUMENT
             default:
                 return FilterType.OTHER;
         }

chrome/android/java/src/org/chromium/chrome/browser/download/home/list/DateOrderedListMutator.java

@@ -185,7 +185,7 @@ class DateOrderedListMutator implements OfflineItemFilterObserver {
                             sectionIndex == 0 && dateIndex > 0 /* showDivider */);
                     if (!mHideSectionHeaders) {
                         sectionHeaderItem.showTitle = !mHideTitleFromSectionHeaders;
-                        sectionHeaderItem.showMenu = filter == OfflineItemFilter.FILTER_IMAGE;
+                        sectionHeaderItem.showMenu = filter == OfflineItemFilter.IMAGE;
                         sectionHeaderItem.items = new ArrayList<>(section.items.values());
                     }
                     listItems.add(sectionHeaderItem);
@@ -195,7 +195,7 @@ class DateOrderedListMutator implements OfflineItemFilterObserver {
                 for (OfflineItem offlineItem : section.items.values()) {
                     OfflineItemListItem item = new OfflineItemListItem(offlineItem);
                     if (mConfig.supportFullWidthImages && section.items.size() == 1
-                            && offlineItem.filter == OfflineItemFilter.FILTER_IMAGE) {
+                            && offlineItem.filter == OfflineItemFilter.IMAGE) {
                         item.spanFullWidth = true;
                     }
                     listItems.add(item);

chrome/android/java/src/org/chromium/chrome/browser/download/home/list/ListUtils.java

@@ -93,16 +93,16 @@ public class ListUtils {
             if (offlineItem.item.isSuggested) return ViewType.PREFETCH;
 
             switch (offlineItem.item.filter) {
-                case OfflineItemFilter.FILTER_VIDEO:
+                case OfflineItemFilter.VIDEO:
                     return inProgress ? ViewType.IN_PROGRESS_VIDEO : ViewType.VIDEO;
-                case OfflineItemFilter.FILTER_IMAGE:
+                case OfflineItemFilter.IMAGE:
                     return inProgress ? ViewType.IN_PROGRESS_IMAGE
                                       : (offlineItem.spanFullWidth ? ViewType.IMAGE_FULL_WIDTH
                                                                    : ViewType.IMAGE);
-                // case OfflineItemFilter.FILTER_PAGE:
-                // case OfflineItemFilter.FILTER_AUDIO:
-                // case OfflineItemFilter.FILTER_OTHER:
-                // case OfflineItemFilter.FILTER_DOCUMENT:
+                // case OfflineItemFilter.PAGE:
+                // case OfflineItemFilter.AUDIO:
+                // case OfflineItemFilter.OTHER:
+                // case OfflineItemFilter.DOCUMENT:
                 default:
                     return inProgress ? ViewType.IN_PROGRESS : ViewType.GENERIC;
             }
@@ -117,17 +117,17 @@ public class ListUtils {
      */
     public static @StringRes int getTextForSection(int filter) {
         switch (filter) {
-            case OfflineItemFilter.FILTER_PAGE:
+            case OfflineItemFilter.PAGE:
                 return R.string.download_manager_ui_pages;
-            case OfflineItemFilter.FILTER_IMAGE:
+            case OfflineItemFilter.IMAGE:
                 return R.string.download_manager_ui_images;
-            case OfflineItemFilter.FILTER_VIDEO:
+            case OfflineItemFilter.VIDEO:
                 return R.string.download_manager_ui_video;
-            case OfflineItemFilter.FILTER_AUDIO:
+            case OfflineItemFilter.AUDIO:
                 return R.string.download_manager_ui_audio;
-            case OfflineItemFilter.FILTER_OTHER:
+            case OfflineItemFilter.OTHER:
                 return R.string.download_manager_ui_other;
-            case OfflineItemFilter.FILTER_DOCUMENT:
+            case OfflineItemFilter.DOCUMENT:
                 return R.string.download_manager_ui_documents;
             default:
                 return R.string.download_manager_ui_all_downloads;

chrome/android/java/src/org/chromium/chrome/browser/download/home/list/UiUtils.java

@@ -168,9 +168,9 @@ public final class UiUtils {
     /** @return Whether or not {@code item} can show a thumbnail in the UI. */
     public static boolean canHaveThumbnails(OfflineItem item) {
         switch (item.filter) {
-            case OfflineItemFilter.FILTER_PAGE:
-            case OfflineItemFilter.FILTER_VIDEO:
-            case OfflineItemFilter.FILTER_IMAGE:
+            case OfflineItemFilter.PAGE:
+            case OfflineItemFilter.VIDEO:
+            case OfflineItemFilter.IMAGE:
                 return true;
             default:
                 return false;

chrome/android/java/src/org/chromium/chrome/browser/download/home/metrics/UmaUtils.java

@@ -212,7 +212,7 @@ public class UmaUtils {
      */
     public static void recordItemsShared(Collection<OfflineItem> items) {
         for (OfflineItem item : items) {
-            if (item.filter == OfflineItemFilter.FILTER_PAGE) {
+            if (item.filter == OfflineItemFilter.PAGE) {
                 RecordUserAction.record("OfflinePages.Sharing.SharePageFromDownloadHome");
             }
 

chrome/android/java/src/org/chromium/chrome/browser/download/ui/DownloadHistoryItemWrapper.java

@@ -540,7 +540,7 @@ public abstract class DownloadHistoryItemWrapper extends TimedItem {
 
         @Override
         public boolean isOfflinePage() {
-            return mItem.filter == OfflineItemFilter.FILTER_PAGE;
+            return mItem.filter == OfflineItemFilter.PAGE;
         }
 
         @Override

chrome/android/javatests/src/org/chromium/chrome/browser/download/ui/StubbedProvider.java

@@ -407,7 +407,7 @@ public class StubbedProvider implements BackendProvider {
         offlineItem.filePath = targetPath;
         offlineItem.creationTimeMs = startTime;
         offlineItem.totalSizeBytes = totalSize;
-        offlineItem.filter = OfflineItemFilter.FILTER_PAGE;
+        offlineItem.filter = OfflineItemFilter.PAGE;
         return offlineItem;
     }
 

chrome/android/junit/src/org/chromium/chrome/browser/download/home/filter/FiltersTest.java

@@ -19,16 +19,16 @@ public class FiltersTest {
     @Test
     public void testFilterConversions() {
         Assert.assertEquals(Integer.valueOf(Filters.FilterType.SITES),
-                Filters.fromOfflineItem(OfflineItemFilter.FILTER_PAGE));
+                Filters.fromOfflineItem(OfflineItemFilter.PAGE));
         Assert.assertEquals(Integer.valueOf(Filters.FilterType.VIDEOS),
-                Filters.fromOfflineItem(OfflineItemFilter.FILTER_VIDEO));
+                Filters.fromOfflineItem(OfflineItemFilter.VIDEO));
         Assert.assertEquals(Integer.valueOf(Filters.FilterType.MUSIC),
-                Filters.fromOfflineItem(OfflineItemFilter.FILTER_AUDIO));
+                Filters.fromOfflineItem(OfflineItemFilter.AUDIO));
         Assert.assertEquals(Integer.valueOf(Filters.FilterType.IMAGES),
-                Filters.fromOfflineItem(OfflineItemFilter.FILTER_IMAGE));
+                Filters.fromOfflineItem(OfflineItemFilter.IMAGE));
         Assert.assertEquals(Integer.valueOf(Filters.FilterType.OTHER),
-                Filters.fromOfflineItem(OfflineItemFilter.FILTER_OTHER));
+                Filters.fromOfflineItem(OfflineItemFilter.OTHER));
         Assert.assertEquals(Integer.valueOf(Filters.FilterType.OTHER),
-                Filters.fromOfflineItem(OfflineItemFilter.FILTER_DOCUMENT));
+                Filters.fromOfflineItem(OfflineItemFilter.DOCUMENT));
     }
 }
\ No newline at end of file

chrome/android/junit/src/org/chromium/chrome/browser/download/home/filter/TypeOfflineItemFilterTest.java

@@ -39,14 +39,14 @@ public class TypeOfflineItemFilterTest {
 
     @Test
     public void testTypeFiltering() {
-        OfflineItem item1 = buildItem(OfflineItemFilter.FILTER_PAGE, false);
-        OfflineItem item2 = buildItem(OfflineItemFilter.FILTER_VIDEO, false);
-        OfflineItem item3 = buildItem(OfflineItemFilter.FILTER_AUDIO, false);
-        OfflineItem item4 = buildItem(OfflineItemFilter.FILTER_IMAGE, false);
-        OfflineItem item5 = buildItem(OfflineItemFilter.FILTER_OTHER, false);
-        OfflineItem item6 = buildItem(OfflineItemFilter.FILTER_DOCUMENT, false);
-        OfflineItem item7 = buildItem(OfflineItemFilter.FILTER_PAGE, true);
-        OfflineItem item8 = buildItem(OfflineItemFilter.FILTER_VIDEO, true);
+        OfflineItem item1 = buildItem(OfflineItemFilter.PAGE, false);
+        OfflineItem item2 = buildItem(OfflineItemFilter.VIDEO, false);
+        OfflineItem item3 = buildItem(OfflineItemFilter.AUDIO, false);
+        OfflineItem item4 = buildItem(OfflineItemFilter.IMAGE, false);
+        OfflineItem item5 = buildItem(OfflineItemFilter.OTHER, false);
+        OfflineItem item6 = buildItem(OfflineItemFilter.DOCUMENT, false);
+        OfflineItem item7 = buildItem(OfflineItemFilter.PAGE, true);
+        OfflineItem item8 = buildItem(OfflineItemFilter.VIDEO, true);
         Collection<OfflineItem> sourceItems =
                 CollectionUtil.newHashSet(item1, item2, item3, item4, item5, item6, item7, item8);
         when(mSource.getItems()).thenReturn(sourceItems);

chrome/browser/download/offline_item_model.cc

@@ -144,7 +144,7 @@ download::DownloadItem::DownloadState OfflineItemModel::GetState() const {
       return download::DownloadItem::COMPLETE;
     case OfflineItemState::CANCELLED:
       return download::DownloadItem::CANCELLED;
-    case OfflineItemState::MAX_DOWNLOAD_STATE:
+    case OfflineItemState::NUM_ENTRIES:
       NOTREACHED();
       return download::DownloadItem::CANCELLED;
   }
@@ -181,7 +181,7 @@ bool OfflineItemModel::IsDone() const {
       FALLTHROUGH;
     case OfflineItemState::CANCELLED:
       return true;
-    case OfflineItemState::MAX_DOWNLOAD_STATE:
+    case OfflineItemState::NUM_ENTRIES:
       NOTREACHED();
   }
   return false;

components/offline_items_collection/core/android/java/src/org/chromium/components/offline_items_collection/OfflineItem.java

@@ -109,7 +109,7 @@ public class OfflineItem implements Cloneable {
 
     public OfflineItem() {
         id = new ContentId();
-        filter = OfflineItemFilter.FILTER_OTHER;
+        filter = OfflineItemFilter.OTHER;
         state = OfflineItemState.COMPLETE;
     }
 

components/offline_items_collection/core/offline_item_filter.h

@@ -11,6 +11,7 @@ namespace offline_items_collection {
 
 // A Java counterpart will be generated for this enum.
 // GENERATED_JAVA_ENUM_PACKAGE: org.chromium.components.offline_items_collection
+// GENERATED_JAVA_PREFIX_TO_STRIP: FILTER_
 enum OfflineItemFilter {
   FILTER_PAGE = 0,
   FILTER_VIDEO,
@@ -19,8 +20,7 @@ enum OfflineItemFilter {
   FILTER_DOCUMENT,
   FILTER_OTHER,
 
-  // Maximum value.
-  FILTER_BOUNDARY,
+  FILTER_NUM_ENTRIES,
 };
 
 // Implemented for test-only. See test_support/offline_item_test_support.cc.

components/offline_items_collection/core/offline_item_state.h

@@ -20,7 +20,7 @@ enum OfflineItemState {
   FAILED,
   PAUSED,  // TODO(dtrainor): Make sure exposing a PAUSED state does not impact
            // downloads resumption.
-  MAX_DOWNLOAD_STATE,
+  NUM_ENTRIES,
 };
 
 // Implemented for testing only. See test_support/offline_item_test_support.cc.

components/offline_items_collection/core/test_support/offline_item_test_support.cc

@@ -66,8 +66,8 @@ std::ostream& operator<<(std::ostream& os, const OfflineItemState& state) {
       return os << "FAILED";
     case PAUSED:
       return os << "PAUSED";
-    case MAX_DOWNLOAD_STATE:
-      return os << "MAX_DOWNLOAD_STATE";
+    case NUM_ENTRIES:
+      return os << "NUM_ENTRIES";
   }
   CHECK(false) << "state=" << static_cast<int>(state);
   return os;
@@ -171,8 +171,8 @@ std::ostream& operator<<(std::ostream& os, OfflineItemFilter state) {
       return os << "FILTER_DOCUMENT";
     case FILTER_OTHER:
       return os << "FILTER_OTHER";
-    case FILTER_BOUNDARY:
-      return os << "FILTER_BOUNDARY";
+    case FILTER_NUM_ENTRIES:
+      return os << "FILTER_NUM_ENTRIES";
   }
   CHECK(false) << "state=" << static_cast<int>(state);
   return os;