Android: Remove unnecessary CollectionUtil.newArrayList()

All uses of it replaced with one of:
* Arrays.asList()
* Collections.emptyList()
* Collections.singletonList()

TBR=agrieve  # Trivial .java refactor to //components

Bug: 1056751
Change-Id: Ie70e425312da48058a098a512cbafa26bdfa5fec
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2476839
Commit-Queue: Andrew Grieve <agrieve@chromium.org>
Reviewed-by: Tommy Nyquist <nyquist@chromium.org>
Cr-Commit-Position: refs/heads/master@{#819229}

base/android/java/src/org/chromium/base/CollectionUtil.java

@@ -7,9 +7,7 @@
 import android.util.Pair;
 
 import androidx.annotation.NonNull;
-import androidx.annotation.VisibleForTesting;
 
-import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.HashMap;
@@ -34,22 +32,6 @@ public static <E> HashSet<E> newHashSet(E... elements) {
         return set;
     }
 
-    @SafeVarargs
-    public static <E> ArrayList<E> newArrayList(E... elements) {
-        ArrayList<E> list = new ArrayList<E>(elements.length);
-        Collections.addAll(list, elements);
-        return list;
-    }
-
-    @VisibleForTesting
-    public static <E> ArrayList<E> newArrayList(Iterable<E> iterable) {
-        ArrayList<E> list = new ArrayList<E>();
-        for (E element : iterable) {
-            list.add(element);
-        }
-        return list;
-    }
-
     @SafeVarargs
     public static <K, V> HashMap<K, V> newHashMap(Pair<? extends K, ? extends V>... entries) {
         HashMap<K, V> map = new HashMap<>();

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

@@ -374,7 +374,7 @@ private void handleDownloadCompletion(DownloadItem downloadItem) {
 
     // OfflineContentProvider.Observer implementation.
     @Override
-    public void onItemsAdded(ArrayList<OfflineItem> items) {
+    public void onItemsAdded(List<OfflineItem> items) {
         for (OfflineItem item : items) {
             if (!isVisibleToUser(item)) continue;
             computeNextStepForUpdate(item);

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

@@ -14,8 +14,8 @@
 import org.chromium.components.offline_items_collection.OfflineItem;
 import org.chromium.components.offline_items_collection.UpdateDelta;
 
-import java.util.ArrayList;
 import java.util.HashSet;
+import java.util.List;
 import java.util.Set;
 
 /**
@@ -69,7 +69,7 @@ public boolean isPersistentContentAvailable() {
     // OfflineContentProvider.Observer overrides
 
     @Override
-    public void onItemsAdded(ArrayList<OfflineItem> items) {
+    public void onItemsAdded(List<OfflineItem> items) {
         if (items.isEmpty()) return;
 
         for (OfflineItem item : items) {

chrome/android/java/src/org/chromium/chrome/browser/download/home/FileDeletionQueue.java

@@ -7,10 +7,10 @@
 import androidx.annotation.VisibleForTesting;
 
 import org.chromium.base.Callback;
-import org.chromium.base.CollectionUtil;
 import org.chromium.base.FileUtils;
 import org.chromium.base.task.AsyncTask;
 
+import java.util.Collections;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Queue;
@@ -93,6 +93,6 @@ protected void onPostExecute(Void result) {
     private static class LazyHolder {
         private static final FileDeletionQueue INSTANCE = new FileDeletionQueue(fileName
                 -> FileUtils.batchDeleteFiles(
-                        CollectionUtil.newArrayList(fileName), FileUtils.DELETE_ALL));
+                        Collections.singletonList(fileName), FileUtils.DELETE_ALL));
     }
 }

chrome/android/java/src/org/chromium/chrome/browser/download/home/LegacyDownloadProviderImpl.java

@@ -7,7 +7,6 @@
 import android.text.TextUtils;
 
 import org.chromium.base.Callback;
-import org.chromium.base.CollectionUtil;
 import org.chromium.base.ObserverList;
 import org.chromium.base.task.PostTask;
 import org.chromium.chrome.browser.download.DownloadInfo;
@@ -29,6 +28,7 @@
 import org.chromium.content_public.browser.UiThreadTaskTraits;
 
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 
 /**
@@ -55,8 +55,7 @@ public LegacyDownloadProviderImpl() {
     public void onDownloadItemCreated(DownloadItem item) {
         if (!canShowDownloadItem(item)) return;
         for (OfflineContentProvider.Observer observer : mObservers) {
-            observer.onItemsAdded(
-                    CollectionUtil.newArrayList(DownloadItem.createOfflineItem(item)));
+            observer.onItemsAdded(Collections.singletonList(DownloadItem.createOfflineItem(item)));
         }
     }
 

chrome/android/java/src/org/chromium/chrome/browser/download/home/OfflineItemSource.java

@@ -14,10 +14,11 @@
 import org.chromium.components.offline_items_collection.OfflineItem;
 import org.chromium.components.offline_items_collection.UpdateDelta;
 
-import java.util.ArrayList;
 import java.util.Collection;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.HashSet;
+import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
@@ -94,7 +95,7 @@ public void removeObserver(OfflineItemFilterObserver observer) {
 
     // OfflineContentProvider.Observer implementation.
     @Override
-    public void onItemsAdded(ArrayList<OfflineItem> items) {
+    public void onItemsAdded(List<OfflineItem> items) {
         Set<OfflineItem> addedItems = new HashSet<OfflineItem>();
         for (OfflineItem item : items) {
             if (mItems.containsKey(item.id)) {
@@ -123,7 +124,7 @@ public void onItemRemoved(ContentId id) {
     public void onItemUpdated(OfflineItem item, UpdateDelta updateDelta) {
         OfflineItem oldItem = mItems.get(item.id);
         if (oldItem == null) {
-            onItemsAdded(CollectionUtil.newArrayList(item));
+            onItemsAdded(Collections.singletonList(item));
         } else {
             mItems.put(item.id, item);
             for (OfflineItemFilterObserver observer : mObservers) {

chrome/android/java/src/org/chromium/chrome/browser/download/home/glue/OfflineContentProviderGlue.java

@@ -189,7 +189,7 @@ public void removeObserver(OfflineContentProvider.Observer observer) {
 
     // OfflineContentProvider.Observer implementation.
     @Override
-    public void onItemsAdded(ArrayList<OfflineItem> items) {
+    public void onItemsAdded(List<OfflineItem> items) {
         for (OfflineContentProvider.Observer observer : mObservers) observer.onItemsAdded(items);
     }
 

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

@@ -53,6 +53,7 @@
 import java.io.Closeable;
 import java.util.ArrayList;
 import java.util.Collection;
+import java.util.Collections;
 import java.util.List;
 
 /**
@@ -333,7 +334,7 @@ private void onCancelItem(OfflineItem item) {
 
     private void onDeleteItem(OfflineItem item) {
         UmaUtils.recordItemAction(ViewAction.MENU_DELETE);
-        deleteItemsInternal(CollectionUtil.newArrayList(item));
+        deleteItemsInternal(Collections.singletonList(item));
     }
 
     private void onShareItem(OfflineItem item) {

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

@@ -4,7 +4,6 @@
 
 package org.chromium.chrome.browser.download.home.list.mutator;
 
-import org.chromium.base.CollectionUtil;
 import org.chromium.chrome.browser.download.home.JustNowProvider;
 import org.chromium.chrome.browser.download.home.filter.OfflineItemFilterObserver;
 import org.chromium.chrome.browser.download.home.filter.OfflineItemFilterSource;
@@ -15,6 +14,7 @@
 
 import java.util.ArrayList;
 import java.util.Collection;
+import java.util.Collections;
 
 /**
  * A class responsible for turning a {@link Collection} of {@link OfflineItem}s into a list meant
@@ -108,8 +108,8 @@ public void onItemUpdated(OfflineItem oldItem, OfflineItem item) {
                 || mJustNowProvider.isJustNowItem(oldItem) != mJustNowProvider.isJustNowItem((item))
                 || offlineItemScheduleDiffer(item, oldItem)) {
             // TODO(shaktisahu): Collect UMA when this happens.
-            onItemsRemoved(CollectionUtil.newArrayList(oldItem));
-            onItemsAdded(CollectionUtil.newArrayList(item));
+            onItemsRemoved(Collections.singletonList(oldItem));
+            onItemsAdded(Collections.singletonList(item));
         } else {
             for (int i = 0; i < mSortedItems.size(); i++) {
                 if (item.id.equals(((OfflineItemListItem) mSortedItems.get(i)).item.id)) {

chrome/android/java/src/org/chromium/chrome/browser/download/items/DownloadBlockedOfflineContentProvider.java

@@ -17,6 +17,7 @@
 import org.chromium.components.offline_items_collection.VisualsCallback;
 
 import java.util.ArrayList;
+import java.util.List;
 
 /**
  * Filters out download offline items till downloads backend fully supports offline content
@@ -109,7 +110,7 @@ public void removeObserver(Observer observer) {
     }
 
     @Override
-    public void onItemsAdded(ArrayList<OfflineItem> items) {
+    public void onItemsAdded(List<OfflineItem> items) {
         ArrayList<OfflineItem> filteredList = getFilteredList(items);
         for (Observer observer : mObservers) {
             observer.onItemsAdded(filteredList);
@@ -132,7 +133,7 @@ public void onItemUpdated(OfflineItem item, UpdateDelta updateDelta) {
         }
     }
 
-    private ArrayList<OfflineItem> getFilteredList(ArrayList<OfflineItem> items) {
+    private ArrayList<OfflineItem> getFilteredList(List<OfflineItem> items) {
         ArrayList<OfflineItem> filteredList = new ArrayList<>();
         for (OfflineItem item : items) {
             if (LegacyHelpers.isLegacyDownload(item.id)) continue;

chrome/android/java/src/org/chromium/chrome/browser/download/items/OfflineContentAggregatorNotificationBridgeUi.java

@@ -18,8 +18,8 @@
 import org.chromium.components.offline_items_collection.UpdateDelta;
 import org.chromium.components.offline_items_collection.VisualsCallback;
 
-import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.List;
 
 /**
  * A glue class that bridges the Profile-attached OfflineContentProvider with the
@@ -73,7 +73,7 @@ public void openItem(OpenParams openParams, ContentId id) {
 
     // OfflineContentProvider.Observer implementation.
     @Override
-    public void onItemsAdded(ArrayList<OfflineItem> items) {
+    public void onItemsAdded(List<OfflineItem> items) {
         for (int i = 0; i < items.size(); ++i) getVisualsAndUpdateItem(items.get(i), null);
     }
 

chrome/android/java/src/org/chromium/chrome/browser/usage_stats/NotificationSuspender.java

@@ -17,7 +17,6 @@
 import android.text.TextUtils;
 import android.webkit.URLUtil;
 
-import org.chromium.base.CollectionUtil;
 import org.chromium.base.ContextUtils;
 import org.chromium.base.Promise;
 import org.chromium.base.annotations.JNINamespace;
@@ -32,6 +31,7 @@
 import org.chromium.content_public.browser.BrowserStartupController.StartupCallback;
 
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 
 /**
@@ -63,7 +63,7 @@ public static Promise<Boolean> maybeSuspendNotification(NotificationWrapper noti
                     if (!fqdns.contains(getValidFqdnOrEmptyString(notification))) return false;
                     UsageStatsService.getInstance()
                             .getNotificationSuspender()
-                            .storeNotificationResources(CollectionUtil.newArrayList(notification));
+                            .storeNotificationResources(Collections.singletonList(notification));
                     return true;
                 });
     }

chrome/android/javatests/src/org/chromium/chrome/browser/IntentHandlerTest.java

@@ -29,7 +29,6 @@
 import org.junit.rules.RuleChain;
 import org.junit.runner.RunWith;
 
-import org.chromium.base.CollectionUtil;
 import org.chromium.base.test.BaseJUnit4ClassRunner;
 import org.chromium.base.test.UiThreadTest;
 import org.chromium.base.test.util.Feature;
@@ -46,6 +45,7 @@
 import org.chromium.content_public.browser.test.util.TestThreadUtils;
 
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 
 /**
@@ -248,9 +248,9 @@ public void testNullUrlIntent() {
     public void testGetQueryFromVoiceSearchResultIntent_validVoiceQuery() {
         Intent intent = new Intent(RecognizerResultsIntent.ACTION_VOICE_SEARCH_RESULTS);
         intent.putStringArrayListExtra(RecognizerResultsIntent.EXTRA_VOICE_SEARCH_RESULT_STRINGS,
-                CollectionUtil.newArrayList(VOICE_SEARCH_QUERY));
+                new ArrayList<>(Collections.singletonList(VOICE_SEARCH_QUERY)));
         intent.putStringArrayListExtra(RecognizerResultsIntent.EXTRA_VOICE_SEARCH_RESULT_URLS,
-                CollectionUtil.newArrayList(VOICE_SEARCH_QUERY_URL));
+                new ArrayList<>(Collections.singletonList(VOICE_SEARCH_QUERY_URL)));
         String query = IntentHandler.getUrlFromVoiceSearchResult(intent);
         Assert.assertEquals(VOICE_SEARCH_QUERY_URL, query);
     }
@@ -262,9 +262,9 @@ public void testGetQueryFromVoiceSearchResultIntent_validVoiceQuery() {
     public void testGetQueryFromVoiceSearchResultIntent_validUrlQuery() {
         Intent intent = new Intent(RecognizerResultsIntent.ACTION_VOICE_SEARCH_RESULTS);
         intent.putStringArrayListExtra(RecognizerResultsIntent.EXTRA_VOICE_SEARCH_RESULT_STRINGS,
-                CollectionUtil.newArrayList(VOICE_URL_QUERY));
+                new ArrayList<>(Collections.singletonList(VOICE_URL_QUERY)));
         intent.putStringArrayListExtra(RecognizerResultsIntent.EXTRA_VOICE_SEARCH_RESULT_URLS,
-                CollectionUtil.newArrayList(VOICE_URL_QUERY_URL));
+                new ArrayList<>(Collections.singletonList(VOICE_URL_QUERY_URL)));
         String query = IntentHandler.getUrlFromVoiceSearchResult(intent);
         Assert.assertTrue(String.format("Expected qualified URL: %s, to start "
                                           + "with http://www.google.com",

chrome/android/javatests/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchInternalStateControllerWrapper.java

@@ -4,9 +4,8 @@
 
 package org.chromium.chrome.browser.contextualsearch;
 
-import org.chromium.base.CollectionUtil;
-
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 
 /**
@@ -16,14 +15,14 @@
 class ContextualSearchInternalStateControllerWrapper
         extends ContextualSearchInternalStateController {
     static final List<Integer> EXPECTED_TAP_RESOLVE_SEQUENCE =
-            CollectionUtil.newArrayList(InternalState.TAP_RECOGNIZED,
-                    InternalState.TAP_GESTURE_COMMIT, InternalState.GATHERING_SURROUNDINGS,
-                    InternalState.DECIDING_SUPPRESSION, InternalState.START_SHOWING_TAP_UI,
-                    InternalState.SHOW_RESOLVING_UI, InternalState.RESOLVING);
+            Arrays.asList(InternalState.TAP_RECOGNIZED, InternalState.TAP_GESTURE_COMMIT,
+                    InternalState.GATHERING_SURROUNDINGS, InternalState.DECIDING_SUPPRESSION,
+                    InternalState.START_SHOWING_TAP_UI, InternalState.SHOW_RESOLVING_UI,
+                    InternalState.RESOLVING);
     static final List<Integer> EXPECTED_LONGPRESS_SEQUENCE =
-            CollectionUtil.newArrayList(InternalState.LONG_PRESS_RECOGNIZED,
-                    InternalState.GATHERING_SURROUNDINGS, InternalState.SHOWING_LONGPRESS_SEARCH);
-    static final List<Integer> EXPECTED_LONGPRESS_RESOLVE_SEQUENCE = CollectionUtil.newArrayList(
+            Arrays.asList(InternalState.LONG_PRESS_RECOGNIZED, InternalState.GATHERING_SURROUNDINGS,
+                    InternalState.SHOWING_LONGPRESS_SEARCH);
+    static final List<Integer> EXPECTED_LONGPRESS_RESOLVE_SEQUENCE = Arrays.asList(
             InternalState.RESOLVING_LONG_PRESS_RECOGNIZED, InternalState.GATHERING_SURROUNDINGS,
             InternalState.SHOW_RESOLVING_UI, InternalState.RESOLVING);
 

chrome/android/javatests/src/org/chromium/chrome/browser/download/DownloadTestRule.java

@@ -30,7 +30,6 @@
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;
-import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
@@ -222,7 +221,7 @@ public void broadcastDownloadSuccessfulForTesting(DownloadInfo downloadInfo) {
 
     private class TestDownloadBackendObserver implements OfflineContentProvider.Observer {
         @Override
-        public void onItemsAdded(ArrayList<OfflineItem> items) {}
+        public void onItemsAdded(List<OfflineItem> items) {}
 
         @Override
         public void onItemRemoved(ContentId id) {}

chrome/android/javatests/src/org/chromium/chrome/browser/download/ServicificationDownloadTest.java

@@ -31,7 +31,7 @@
 import org.chromium.content_public.browser.test.util.TestThreadUtils;
 import org.chromium.net.test.EmbeddedTestServerRule;
 
-import java.util.ArrayList;
+import java.util.List;
 
 /**
  * Tests interrupted download can be resumed with Service Manager only mode.
@@ -70,7 +70,7 @@ private static class DownloadUpdateObserver implements OfflineContentProvider.Ob
         private boolean mDownloadCompleted;
 
         @Override
-        public void onItemsAdded(ArrayList<OfflineItem> items) {}
+        public void onItemsAdded(List<OfflineItem> items) {}
 
         @Override
         public void onItemRemoved(ContentId id) {}

chrome/android/javatests/src/org/chromium/chrome/browser/incognito/IncognitoDownloadLeakageTest.java

@@ -111,7 +111,7 @@ public void onAddOrReplaceDownloadSharedPreferenceEntry(ContentId id) {}
     private OfflineContentProvider.Observer mTestDownloadBackendObserver =
             new OfflineContentProvider.Observer() {
                 @Override
-                public void onItemsAdded(ArrayList<OfflineItem> items) {}
+                public void onItemsAdded(List<OfflineItem> items) {}
 
                 @Override
                 public void onItemRemoved(ContentId id) {}