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 @@ package org.chromium.base;
 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 final class CollectionUtil {
         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 @@ public class DownloadInfoBarController implements OfflineContentProvider.Observe
 
     // 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.OfflineContentProvider;
 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 class OfflineContentAvailabilityStatusProvider implements OfflineContentP
     // 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 @@ package org.chromium.chrome.browser.download.home;
 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 @@ class FileDeletionQueue {
     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 @@ package org.chromium.chrome.browser.download.home;
 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.components.offline_items_collection.VisualsCallback;
 import org.chromium.content_public.browser.UiThreadTaskTraits;
 
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 
 /**
@@ -55,8 +55,7 @@ class LegacyDownloadProviderImpl implements DownloadObserver, LegacyDownloadProv
     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.OfflineContentProvider;
 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 class OfflineItemSource implements OfflineItemFilterSource, OfflineConten
 
     // 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 class OfflineItemSource implements OfflineItemFilterSource, OfflineConten
     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 class OfflineContentProviderGlue implements OfflineContentProvider.Observ
 
     // 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 org.chromium.components.offline_items_collection.VisualsCallback;
 import java.io.Closeable;
 import java.util.ArrayList;
 import java.util.Collection;
+import java.util.Collections;
 import java.util.List;
 
 /**
@@ -333,7 +334,7 @@ class DateOrderedListMediator {
 
     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 org.chromium.components.offline_items_collection.OfflineItem;
 
 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 class DateOrderedListMutator implements OfflineItemFilterObserver {
                 || 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.UpdateDelta;
 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 @@ class DownloadBlockedOfflineContentProvider
     }
 
     @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 @@ class DownloadBlockedOfflineContentProvider
         }
     }
 
-    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.OpenParams;
 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 class OfflineContentAggregatorNotificationBridgeUi
 
     // 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.service.notification.StatusBarNotification;
 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;
 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 class NotificationSuspender {
                     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.Test;
 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.components.embedder_support.util.UrlConstants;
 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 class IntentHandlerTest {
     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 class IntentHandlerTest {
     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 @@ import java.util.List;
 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 org.chromium.content_public.browser.test.util.TestThreadUtils;
 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 class DownloadTestRule extends ChromeActivityTestRule<ChromeActivity> {
 
     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.CriteriaHelper;
 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 @@ public final class ServicificationDownloadTest {
         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 class IncognitoDownloadLeakageTest {
     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) {}

chrome/android/javatests/src/org/chromium/chrome/browser/media/MediaLauncherActivityTest.java

@@ -21,7 +21,6 @@ import org.junit.Rule;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
-import org.chromium.base.CollectionUtil;
 import org.chromium.base.test.util.CommandLineFlags;
 import org.chromium.base.test.util.UrlUtils;
 import org.chromium.chrome.browser.customtabs.CustomTabActivity;
@@ -34,6 +33,7 @@ import org.chromium.chrome.test.util.ActivityUtils;
 import org.chromium.content_public.browser.test.util.Criteria;
 import org.chromium.content_public.browser.test.util.CriteriaHelper;
 
+import java.util.Arrays;
 import java.util.List;
 import java.util.concurrent.Callable;
 
@@ -90,7 +90,7 @@ public class MediaLauncherActivityTest {
     @Test
     @SmallTest
     public void testFilterURI() {
-        List<Pair<String, String>> testCases = CollectionUtil.newArrayList(
+        List<Pair<String, String>> testCases = Arrays.asList(
                 new Pair<>("file:///test.jpg", "file:///test.jpg"),
                 new Pair<>("file:///test.jp!g", "file:///test.jp!g"),
                 new Pair<>("file:///test!$'.jpg", "file:///test.jpg"),

chrome/android/javatests/src/org/chromium/chrome/browser/offlinepages/MHTMLPageTest.java

@@ -35,7 +35,7 @@ import org.chromium.content_public.browser.test.util.TestThreadUtils;
 import org.chromium.net.test.EmbeddedTestServer;
 import org.chromium.ui.base.PageTransition;
 
-import java.util.ArrayList;
+import java.util.List;
 import java.util.concurrent.Semaphore;
 import java.util.concurrent.TimeUnit;
 
@@ -87,7 +87,7 @@ public class MHTMLPageTest implements CustomMainActivityStart {
         }
 
         @Override
-        public void onItemsAdded(ArrayList<OfflineItem> items) {}
+        public void onItemsAdded(List<OfflineItem> items) {}
 
         @Override
         public void onItemRemoved(ContentId id) {}

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

@@ -21,10 +21,10 @@ import org.robolectric.annotation.Config;
 import org.robolectric.shadows.ShadowLooper;
 
 import org.chromium.base.Callback;
-import org.chromium.base.CollectionUtil;
 import org.chromium.base.ThreadUtils;
 import org.chromium.base.test.BaseRobolectricTestRunner;
 
+import java.util.Arrays;
 import java.util.concurrent.Semaphore;
 
 /** Unit tests for the FileDeletionQueue class. */
@@ -74,7 +74,7 @@ public class FileDeletionQueueTest {
     @Test
     public void testMultipleDeletionsAPI() {
         FileDeletionQueue queue = new FileDeletionQueue(mWrappedDeleter);
-        queue.delete(CollectionUtil.newArrayList("test1", "test2", "test3"));
+        queue.delete(Arrays.asList("test1", "test2", "test3"));
 
         mWrappedDeleter.waitFor(3);
         verify(mDeleter, times(1)).onResult("test1");
@@ -85,7 +85,7 @@ public class FileDeletionQueueTest {
     @Test
     public void testOneDeletionHappensAtATime() {
         FileDeletionQueue queue = new FileDeletionQueue(mWrappedDeleter);
-        queue.delete(CollectionUtil.newArrayList("test1", "test2", "test3"));
+        queue.delete(Arrays.asList("test1", "test2", "test3"));
 
         mWrappedDeleter.waitFor(1);
         verify(mDeleter, times(1)).onResult("test1");

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

@@ -21,7 +21,6 @@ import org.mockito.junit.MockitoJUnit;
 import org.mockito.junit.MockitoRule;
 import org.robolectric.annotation.Config;
 
-import org.chromium.base.CollectionUtil;
 import org.chromium.base.test.BaseRobolectricTestRunner;
 import org.chromium.base.test.util.JniMocker;
 import org.chromium.chrome.browser.download.home.DownloadManagerUiConfig;
@@ -46,6 +45,7 @@ import org.chromium.components.url_formatter.UrlFormatter;
 import org.chromium.components.url_formatter.UrlFormatterJni;
 import org.chromium.ui.modelutil.ListObservable.ListObserver;
 
+import java.util.Arrays;
 import java.util.Calendar;
 import java.util.Collections;
 import java.util.Date;
@@ -106,7 +106,7 @@ public class DateOrderedListMutatorTest {
     @Test
     public void testSingleItem() {
         OfflineItem item1 = buildItem("1", buildCalendar(2018, 1, 1, 1), OfflineItemFilter.VIDEO);
-        when(mSource.getItems()).thenReturn(CollectionUtil.newArrayList(item1));
+        when(mSource.getItems()).thenReturn(Collections.singletonList(item1));
         DateOrderedListMutator list = createMutatorWithoutJustNowProvider();
 
         Assert.assertEquals(2, mModel.size());
@@ -125,7 +125,7 @@ public class DateOrderedListMutatorTest {
     public void testTwoItemsSameDay() {
         OfflineItem item1 = buildItem("1", buildCalendar(2018, 1, 1, 2), OfflineItemFilter.VIDEO);
         OfflineItem item2 = buildItem("2", buildCalendar(2018, 1, 1, 1), OfflineItemFilter.VIDEO);
-        when(mSource.getItems()).thenReturn(CollectionUtil.newArrayList(item1, item2));
+        when(mSource.getItems()).thenReturn(Arrays.asList(item1, item2));
         DateOrderedListMutator list = createMutatorWithoutJustNowProvider();
 
         Assert.assertEquals(3, mModel.size());
@@ -144,7 +144,7 @@ public class DateOrderedListMutatorTest {
     public void testTwoItemsSameDayDifferentSection() {
         OfflineItem item1 = buildItem("1", buildCalendar(2018, 1, 1, 2), OfflineItemFilter.VIDEO);
         OfflineItem item2 = buildItem("2", buildCalendar(2018, 1, 1, 1), OfflineItemFilter.AUDIO);
-        when(mSource.getItems()).thenReturn(CollectionUtil.newArrayList(item1, item2));
+        when(mSource.getItems()).thenReturn(Arrays.asList(item1, item2));
         DateOrderedListMutator list = createMutatorWithoutJustNowProvider();
 
         Assert.assertEquals(3, mModel.size());
@@ -163,7 +163,7 @@ public class DateOrderedListMutatorTest {
     public void testSingleItemInJustNowSection() {
         OfflineItem item1 = buildItem("1", buildCalendar(2018, 1, 1, 1), OfflineItemFilter.VIDEO);
         item1.state = OfflineItemState.IN_PROGRESS;
-        when(mSource.getItems()).thenReturn(CollectionUtil.newArrayList(item1));
+        when(mSource.getItems()).thenReturn(Collections.singletonList(item1));
         DateOrderedListMutator list = createMutatorWithJustNowProvider();
 
         Assert.assertEquals(2, mModel.size());
@@ -187,7 +187,7 @@ public class DateOrderedListMutatorTest {
         item1.state = OfflineItemState.IN_PROGRESS;
         item2.state = OfflineItemState.COMPLETE;
         item2.completionTimeMs = item2.creationTimeMs;
-        when(mSource.getItems()).thenReturn(CollectionUtil.newArrayList(item1, item2));
+        when(mSource.getItems()).thenReturn(Arrays.asList(item1, item2));
         DateOrderedListMutator list =
                 createMutatorWithJustNowProvider(buildJustNowProvider(calendar.getTime()));
 
@@ -218,7 +218,7 @@ public class DateOrderedListMutatorTest {
         OfflineItem item3 = buildItem("3", buildCalendar(2018, 1, 1, 10), OfflineItemFilter.AUDIO);
         item1.completionTimeMs = item1.creationTimeMs;
         item2.completionTimeMs = item2.creationTimeMs;
-        when(mSource.getItems()).thenReturn(CollectionUtil.newArrayList(item1, item2, item3));
+        when(mSource.getItems()).thenReturn(Arrays.asList(item1, item2, item3));
 
         Calendar now = CalendarFactory.get();
         now.set(2018, 1, 2, 0, 15);
@@ -250,7 +250,7 @@ public class DateOrderedListMutatorTest {
     public void testItemDoesNotMoveOutOfJustNowSection() {
         OfflineItem item1 = buildItem("1", buildCalendar(2018, 1, 1, 1), OfflineItemFilter.VIDEO);
         item1.state = OfflineItemState.PAUSED;
-        when(mSource.getItems()).thenReturn(CollectionUtil.newArrayList(item1));
+        when(mSource.getItems()).thenReturn(Collections.singletonList(item1));
         DateOrderedListMutator list = createMutatorWithJustNowProvider();
         mModel.addObserver(mObserver);
 
@@ -261,7 +261,7 @@ public class DateOrderedListMutatorTest {
         // Resume the download.
         OfflineItem update1 = buildItem("1", buildCalendar(2018, 1, 1, 1), OfflineItemFilter.VIDEO);
         update1.state = OfflineItemState.IN_PROGRESS;
-        when(mSource.getItems()).thenReturn(CollectionUtil.newArrayList(update1));
+        when(mSource.getItems()).thenReturn(Collections.singletonList(update1));
         list.onItemUpdated(item1, update1);
 
         Assert.assertEquals(2, mModel.size());
@@ -272,7 +272,7 @@ public class DateOrderedListMutatorTest {
         OfflineItem update2 = buildItem("1", buildCalendar(2018, 1, 1, 1), OfflineItemFilter.VIDEO);
         update2.state = OfflineItemState.COMPLETE;
         update2.completionTimeMs = new Date().getTime();
-        when(mSource.getItems()).thenReturn(CollectionUtil.newArrayList(update2));
+        when(mSource.getItems()).thenReturn(Collections.singletonList(update2));
         list.onItemUpdated(update1, update2);
 
         Assert.assertEquals(2, mModel.size());
@@ -283,7 +283,7 @@ public class DateOrderedListMutatorTest {
         OfflineItem update3 = buildItem("1", buildCalendar(2018, 1, 1, 1), OfflineItemFilter.VIDEO);
         update3.state = OfflineItemState.COMPLETE;
         update3.completionTimeMs = buildCalendar(2017, 1, 1, 1).getTimeInMillis();
-        when(mSource.getItems()).thenReturn(CollectionUtil.newArrayList(update3));
+        when(mSource.getItems()).thenReturn(Collections.singletonList(update3));
         list.onItemUpdated(update2, update3);
 
         Assert.assertEquals(2, mModel.size());
@@ -304,7 +304,7 @@ public class DateOrderedListMutatorTest {
         OfflineItem item1 = buildItem("1", buildCalendar(2018, 2, 1, 1), OfflineItemFilter.VIDEO);
         OfflineItem item2 = buildItem("2", buildCalendar(2018, 1, 1, 1), OfflineItemFilter.AUDIO);
         item1.state = OfflineItemState.IN_PROGRESS;
-        when(mSource.getItems()).thenReturn(CollectionUtil.newArrayList(item1, item2));
+        when(mSource.getItems()).thenReturn(Arrays.asList(item1, item2));
         DateOrderedListMutator list = createMutatorWithJustNowProvider();
 
         Assert.assertEquals(4, mModel.size());
@@ -331,7 +331,7 @@ public class DateOrderedListMutatorTest {
         OfflineItem item2 = buildItem("1", buildCalendar(2018, 2, 1, 1), OfflineItemFilter.VIDEO);
         OfflineItem item3 = buildItem("2", buildCalendar(2018, 1, 1, 1), OfflineItemFilter.AUDIO);
         item2.state = OfflineItemState.IN_PROGRESS;
-        when(mSource.getItems()).thenReturn(CollectionUtil.newArrayList(item1, item2, item3));
+        when(mSource.getItems()).thenReturn(Arrays.asList(item1, item2, item3));
         DateOrderedListMutator list = createMutatorWithJustNowProvider();
 
         Assert.assertEquals(6, mModel.size());
@@ -356,7 +356,7 @@ public class DateOrderedListMutatorTest {
     public void testTwoItemsDifferentDayMatchHeader() {
         OfflineItem item1 = buildItem("1", buildCalendar(2018, 1, 2, 0), OfflineItemFilter.VIDEO);
         OfflineItem item2 = buildItem("2", buildCalendar(2018, 1, 1, 0), OfflineItemFilter.AUDIO);
-        when(mSource.getItems()).thenReturn(CollectionUtil.newArrayList(item1, item2));
+        when(mSource.getItems()).thenReturn(Arrays.asList(item1, item2));
         DateOrderedListMutator list = createMutatorWithoutJustNowProvider();
 
         Assert.assertEquals(4, mModel.size());
@@ -377,7 +377,7 @@ public class DateOrderedListMutatorTest {
     public void testTwoItemsSameDayOutOfOrder() {
         OfflineItem item1 = buildItem("1", buildCalendar(2018, 1, 1, 4), OfflineItemFilter.VIDEO);
         OfflineItem item2 = buildItem("2", buildCalendar(2018, 1, 1, 5), OfflineItemFilter.VIDEO);
-        when(mSource.getItems()).thenReturn(CollectionUtil.newArrayList(item1, item2));
+        when(mSource.getItems()).thenReturn(Arrays.asList(item1, item2));
         DateOrderedListMutator list = createMutatorWithoutJustNowProvider();
 
         Assert.assertEquals(3, mModel.size());
@@ -398,7 +398,7 @@ public class DateOrderedListMutatorTest {
     public void testTwoItemsDifferentDaySameSection() {
         OfflineItem item1 = buildItem("1", buildCalendar(2018, 1, 2, 4), OfflineItemFilter.VIDEO);
         OfflineItem item2 = buildItem("2", buildCalendar(2018, 1, 1, 5), OfflineItemFilter.VIDEO);
-        when(mSource.getItems()).thenReturn(CollectionUtil.newArrayList(item1, item2));
+        when(mSource.getItems()).thenReturn(Arrays.asList(item1, item2));
         DateOrderedListMutator list = createMutatorWithoutJustNowProvider();
 
         Assert.assertEquals(4, mModel.size());
@@ -420,7 +420,7 @@ public class DateOrderedListMutatorTest {
     public void testTwoItemsDifferentDayDifferentSection() {
         OfflineItem item1 = buildItem("1", buildCalendar(2018, 1, 2, 4), OfflineItemFilter.VIDEO);
         OfflineItem item2 = buildItem("2", buildCalendar(2018, 1, 1, 5), OfflineItemFilter.PAGE);
-        when(mSource.getItems()).thenReturn(CollectionUtil.newArrayList(item1, item2));
+        when(mSource.getItems()).thenReturn(Arrays.asList(item1, item2));
         DateOrderedListMutator list = createMutatorWithoutJustNowProvider();
 
         Assert.assertEquals(4, mModel.size());
@@ -442,7 +442,7 @@ public class DateOrderedListMutatorTest {
     public void testTwoItemsDifferentDayOutOfOrder() {
         OfflineItem item1 = buildItem("1", buildCalendar(2018, 1, 1, 4), OfflineItemFilter.VIDEO);
         OfflineItem item2 = buildItem("2", buildCalendar(2018, 1, 2, 3), OfflineItemFilter.VIDEO);
-        when(mSource.getItems()).thenReturn(CollectionUtil.newArrayList(item1, item2));
+        when(mSource.getItems()).thenReturn(Arrays.asList(item1, item2));
         DateOrderedListMutator list = createMutatorWithoutJustNowProvider();
 
         Assert.assertEquals(4, mModel.size());
@@ -466,8 +466,8 @@ public class DateOrderedListMutatorTest {
         mModel.addObserver(mObserver);
 
         OfflineItem item1 = buildItem("1", buildCalendar(2018, 1, 1, 4), OfflineItemFilter.VIDEO);
-        when(mSource.getItems()).thenReturn(CollectionUtil.newArrayList(item1));
-        list.onItemsAdded(CollectionUtil.newArrayList(item1));
+        when(mSource.getItems()).thenReturn(Collections.singletonList(item1));
+        list.onItemsAdded(Collections.singletonList(item1));
 
         Assert.assertEquals(2, mModel.size());
         assertOfflineItem(mModel.get(1), buildCalendar(2018, 1, 1, 4), item1);
@@ -489,14 +489,14 @@ public class DateOrderedListMutatorTest {
     @Test
     public void testAddFirstItemToList() {
         OfflineItem item1 = buildItem("1", buildCalendar(2018, 1, 2, 1), OfflineItemFilter.VIDEO);
-        when(mSource.getItems()).thenReturn(CollectionUtil.newArrayList(item1));
+        when(mSource.getItems()).thenReturn(Collections.singletonList(item1));
         DateOrderedListMutator list = createMutatorWithoutJustNowProvider();
         mModel.addObserver(mObserver);
 
         // Add an item on the same day that will be placed first.
         OfflineItem item2 = buildItem("2", buildCalendar(2018, 1, 2, 2), OfflineItemFilter.VIDEO);
-        when(mSource.getItems()).thenReturn(CollectionUtil.newArrayList(item1, item2));
-        list.onItemsAdded(CollectionUtil.newArrayList(item2));
+        when(mSource.getItems()).thenReturn(Arrays.asList(item1, item2));
+        list.onItemsAdded(Collections.singletonList(item2));
 
         Assert.assertEquals(3, mModel.size());
         assertOfflineItem(mModel.get(1), buildCalendar(2018, 1, 2, 2), item2);
@@ -504,8 +504,8 @@ public class DateOrderedListMutatorTest {
 
         // Add an item on an earlier day that will be placed first.
         OfflineItem item3 = buildItem("3", buildCalendar(2018, 1, 3, 2), OfflineItemFilter.VIDEO);
-        when(mSource.getItems()).thenReturn(CollectionUtil.newArrayList(item1, item2, item3));
-        list.onItemsAdded(CollectionUtil.newArrayList(item3));
+        when(mSource.getItems()).thenReturn(Arrays.asList(item1, item2, item3));
+        list.onItemsAdded(Collections.singletonList(item3));
 
         Assert.assertEquals(5, mModel.size());
         assertOfflineItem(mModel.get(1), buildCalendar(2018, 1, 3, 2), item3);
@@ -531,14 +531,14 @@ public class DateOrderedListMutatorTest {
     @Test
     public void testAddLastItemToList() {
         OfflineItem item1 = buildItem("1", buildCalendar(2018, 1, 2, 4), OfflineItemFilter.VIDEO);
-        when(mSource.getItems()).thenReturn(CollectionUtil.newArrayList(item1));
+        when(mSource.getItems()).thenReturn(Collections.singletonList(item1));
         DateOrderedListMutator list = createMutatorWithoutJustNowProvider();
         mModel.addObserver(mObserver);
 
         // Add an item on the same day that will be placed last.
         OfflineItem item2 = buildItem("2", buildCalendar(2018, 1, 2, 3), OfflineItemFilter.VIDEO);
-        when(mSource.getItems()).thenReturn(CollectionUtil.newArrayList(item1, item2));
-        list.onItemsAdded(CollectionUtil.newArrayList(item2));
+        when(mSource.getItems()).thenReturn(Arrays.asList(item1, item2));
+        list.onItemsAdded(Collections.singletonList(item2));
 
         Assert.assertEquals(3, mModel.size());
         assertOfflineItem(mModel.get(1), buildCalendar(2018, 1, 2, 4), item1);
@@ -546,8 +546,8 @@ public class DateOrderedListMutatorTest {
 
         // Add an item on a later day that will be placed last.
         OfflineItem item3 = buildItem("3", buildCalendar(2018, 1, 1, 4), OfflineItemFilter.VIDEO);
-        when(mSource.getItems()).thenReturn(CollectionUtil.newArrayList(item1, item2, item3));
-        list.onItemsAdded(CollectionUtil.newArrayList(item3));
+        when(mSource.getItems()).thenReturn(Arrays.asList(item1, item2, item3));
+        list.onItemsAdded(Collections.singletonList(item3));
 
         Assert.assertEquals(5, mModel.size());
         assertOfflineItem(mModel.get(1), buildCalendar(2018, 1, 2, 4), item1);
@@ -566,12 +566,12 @@ public class DateOrderedListMutatorTest {
     @Test
     public void testRemoveOnlyItemInList() {
         OfflineItem item1 = buildItem("1", buildCalendar(2018, 1, 2, 2), OfflineItemFilter.VIDEO);
-        when(mSource.getItems()).thenReturn(CollectionUtil.newArrayList(item1));
+        when(mSource.getItems()).thenReturn(Collections.singletonList(item1));
         DateOrderedListMutator list = createMutatorWithoutJustNowProvider();
         mModel.addObserver(mObserver);
 
         when(mSource.getItems()).thenReturn(Collections.emptySet());
-        list.onItemsRemoved(CollectionUtil.newArrayList(item1));
+        list.onItemsRemoved(Collections.singletonList(item1));
 
         Assert.assertEquals(0, mModel.size());
     }
@@ -590,12 +590,12 @@ public class DateOrderedListMutatorTest {
     public void testRemoveFirstItemInListSameDay() {
         OfflineItem item1 = buildItem("1", buildCalendar(2018, 1, 2, 3), OfflineItemFilter.VIDEO);
         OfflineItem item2 = buildItem("2", buildCalendar(2018, 1, 2, 2), OfflineItemFilter.VIDEO);
-        when(mSource.getItems()).thenReturn(CollectionUtil.newArrayList(item1, item2));
+        when(mSource.getItems()).thenReturn(Arrays.asList(item1, item2));
         DateOrderedListMutator list = createMutatorWithoutJustNowProvider();
         mModel.addObserver(mObserver);
 
-        when(mSource.getItems()).thenReturn(CollectionUtil.newArrayList(item2));
-        list.onItemsRemoved(CollectionUtil.newArrayList(item1));
+        when(mSource.getItems()).thenReturn(Collections.singletonList(item2));
+        list.onItemsRemoved(Collections.singletonList(item1));
 
         Assert.assertEquals(2, mModel.size());
         assertSectionHeader(mModel.get(0), buildCalendar(2018, 1, 2, 0), false);
@@ -616,12 +616,12 @@ public class DateOrderedListMutatorTest {
     public void testRemoveLastItemInListSameDay() {
         OfflineItem item1 = buildItem("1", buildCalendar(2018, 1, 2, 3), OfflineItemFilter.VIDEO);
         OfflineItem item2 = buildItem("2", buildCalendar(2018, 1, 2, 2), OfflineItemFilter.VIDEO);
-        when(mSource.getItems()).thenReturn(CollectionUtil.newArrayList(item1, item2));
+        when(mSource.getItems()).thenReturn(Arrays.asList(item1, item2));
         DateOrderedListMutator list = createMutatorWithoutJustNowProvider();
         mModel.addObserver(mObserver);
 
-        when(mSource.getItems()).thenReturn(CollectionUtil.newArrayList(item1));
-        list.onItemsRemoved(CollectionUtil.newArrayList(item2));
+        when(mSource.getItems()).thenReturn(Collections.singletonList(item1));
+        list.onItemsRemoved(Collections.singletonList(item2));
 
         Assert.assertEquals(2, mModel.size());
         assertSectionHeader(mModel.get(0), buildCalendar(2018, 1, 2, 0), false);
@@ -643,12 +643,12 @@ public class DateOrderedListMutatorTest {
     public void testRemoveLastItemInListWithMultipleDays() {
         OfflineItem item1 = buildItem("1", buildCalendar(2018, 1, 3, 3), OfflineItemFilter.VIDEO);
         OfflineItem item2 = buildItem("2", buildCalendar(2018, 1, 2, 2), OfflineItemFilter.VIDEO);
-        when(mSource.getItems()).thenReturn(CollectionUtil.newArrayList(item1, item2));
+        when(mSource.getItems()).thenReturn(Arrays.asList(item1, item2));
         DateOrderedListMutator list = createMutatorWithoutJustNowProvider();
         mModel.addObserver(mObserver);
 
-        when(mSource.getItems()).thenReturn(CollectionUtil.newArrayList(item1));
-        list.onItemsRemoved(CollectionUtil.newArrayList(item2));
+        when(mSource.getItems()).thenReturn(Collections.singletonList(item1));
+        list.onItemsRemoved(Collections.singletonList(item2));
 
         Assert.assertEquals(2, mModel.size());
         assertSectionHeader(mModel.get(0), buildCalendar(2018, 1, 3, 0), false);
@@ -679,9 +679,8 @@ public class DateOrderedListMutatorTest {
         OfflineItem item3 = buildItem("3", buildCalendar(2018, 1, 2, 10), OfflineItemFilter.VIDEO);
         OfflineItem item4 = buildItem("4", buildCalendar(2018, 1, 2, 12), OfflineItemFilter.VIDEO);
 
-        when(mSource.getItems())
-                .thenReturn(CollectionUtil.newArrayList(item1, item2, item3, item4));
-        list.onItemsAdded(CollectionUtil.newArrayList(item1, item2, item3, item4));
+        when(mSource.getItems()).thenReturn(Arrays.asList(item1, item2, item3, item4));
+        list.onItemsAdded(Arrays.asList(item1, item2, item3, item4));
 
         Assert.assertEquals(6, mModel.size());
         assertSectionHeader(mModel.get(0), buildCalendar(2018, 1, 2, 0), false);
@@ -715,23 +714,23 @@ public class DateOrderedListMutatorTest {
         mModel.addObserver(mObserver);
 
         OfflineItem item3 = buildItem("3", buildCalendar(2018, 1, 1, 4), OfflineItemFilter.VIDEO);
-        when(mSource.getItems()).thenReturn(CollectionUtil.newArrayList(item3));
-        list.onItemsAdded(CollectionUtil.newArrayList(item3));
+        when(mSource.getItems()).thenReturn(Collections.singletonList(item3));
+        list.onItemsAdded(Collections.singletonList(item3));
 
         Assert.assertEquals(2, mModel.size());
         assertOfflineItem(mModel.get(1), buildCalendar(2018, 1, 1, 4), item3);
 
         OfflineItem item1 = buildItem("1", buildCalendar(2018, 1, 1, 4), OfflineItemFilter.VIDEO);
-        when(mSource.getItems()).thenReturn(CollectionUtil.newArrayList(item3, item1));
-        list.onItemsAdded(CollectionUtil.newArrayList(item1));
+        when(mSource.getItems()).thenReturn(Arrays.asList(item3, item1));
+        list.onItemsAdded(Collections.singletonList(item1));
 
         Assert.assertEquals(3, mModel.size());
         assertOfflineItem(mModel.get(1), buildCalendar(2018, 1, 1, 4), item1);
         assertOfflineItem(mModel.get(2), buildCalendar(2018, 1, 1, 4), item3);
 
         OfflineItem item2 = buildItem("2", buildCalendar(2018, 1, 1, 4), OfflineItemFilter.VIDEO);
-        when(mSource.getItems()).thenReturn(CollectionUtil.newArrayList(item3, item1, item2));
-        list.onItemsAdded(CollectionUtil.newArrayList(item2));
+        when(mSource.getItems()).thenReturn(Arrays.asList(item3, item1, item2));
+        list.onItemsAdded(Collections.singletonList(item2));
 
         Assert.assertEquals(4, mModel.size());
         assertOfflineItem(mModel.get(1), buildCalendar(2018, 1, 1, 4), item1);
@@ -760,8 +759,8 @@ public class DateOrderedListMutatorTest {
 
         OfflineItem item1 = buildItem("1", buildCalendar(2018, 1, 1, 6), OfflineItemFilter.VIDEO);
 
-        when(mSource.getItems()).thenReturn(CollectionUtil.newArrayList(item1));
-        list.onItemsAdded(CollectionUtil.newArrayList(item1));
+        when(mSource.getItems()).thenReturn(Collections.singletonList(item1));
+        list.onItemsAdded(Collections.singletonList(item1));
 
         Assert.assertEquals(2, mModel.size());
         assertSectionHeader(mModel.get(0), buildCalendar(2018, 1, 1, 0), false);
@@ -770,12 +769,12 @@ public class DateOrderedListMutatorTest {
         // Complete the download.
         OfflineItem update1 = buildItem("1", buildCalendar(2018, 1, 1, 6), OfflineItemFilter.VIDEO);
         update1.state = OfflineItemState.COMPLETE;
-        when(mSource.getItems()).thenReturn(CollectionUtil.newArrayList(update1));
+        when(mSource.getItems()).thenReturn(Collections.singletonList(update1));
         list.onItemUpdated(item1, update1);
 
         // Add a new download.
         OfflineItem item2 = buildItem("2", buildCalendar(2018, 1, 1, 4), OfflineItemFilter.VIDEO);
-        list.onItemsAdded(CollectionUtil.newArrayList(item2));
+        list.onItemsAdded(Collections.singletonList(item2));
 
         Assert.assertEquals(3, mModel.size());
         assertSectionHeader(mModel.get(0), buildCalendar(2018, 1, 1, 0), false);
@@ -805,13 +804,12 @@ public class DateOrderedListMutatorTest {
         OfflineItem item3 = buildItem("3", buildCalendar(2018, 1, 2, 10), OfflineItemFilter.VIDEO);
         OfflineItem item4 = buildItem("4", buildCalendar(2018, 1, 2, 12), OfflineItemFilter.VIDEO);
 
-        when(mSource.getItems())
-                .thenReturn(CollectionUtil.newArrayList(item1, item2, item3, item4));
+        when(mSource.getItems()).thenReturn(Arrays.asList(item1, item2, item3, item4));
         DateOrderedListMutator list = createMutatorWithoutJustNowProvider();
         mModel.addObserver(mObserver);
 
-        when(mSource.getItems()).thenReturn(CollectionUtil.newArrayList(item1));
-        list.onItemsRemoved(CollectionUtil.newArrayList(item2, item3, item4));
+        when(mSource.getItems()).thenReturn(Collections.singletonList(item1));
+        list.onItemsRemoved(Arrays.asList(item2, item3, item4));
 
         Assert.assertEquals(2, mModel.size());
         assertSectionHeader(mModel.get(0), buildCalendar(2018, 1, 1, 0), false);
@@ -833,14 +831,14 @@ public class DateOrderedListMutatorTest {
     public void testItemUpdatedSameTimestamp() {
         OfflineItem item1 = buildItem("1", buildCalendar(2018, 1, 1, 4), OfflineItemFilter.VIDEO);
 
-        when(mSource.getItems()).thenReturn(CollectionUtil.newArrayList(item1));
+        when(mSource.getItems()).thenReturn(Collections.singletonList(item1));
         DateOrderedListMutator list = createMutatorWithoutJustNowProvider();
         mModel.addObserver(mObserver);
 
         // Update an item with the same timestamp.
         OfflineItem newItem1 =
                 buildItem("1", buildCalendar(2018, 1, 1, 4), OfflineItemFilter.VIDEO);
-        when(mSource.getItems()).thenReturn(CollectionUtil.newArrayList(newItem1));
+        when(mSource.getItems()).thenReturn(Collections.singletonList(newItem1));
         list.onItemUpdated(item1, newItem1);
 
         Assert.assertEquals(2, mModel.size());
@@ -865,14 +863,14 @@ public class DateOrderedListMutatorTest {
         OfflineItem item1 = buildItem("1", buildCalendar(2018, 1, 1, 5), OfflineItemFilter.VIDEO);
         OfflineItem item2 = buildItem("2", buildCalendar(2018, 1, 1, 4), OfflineItemFilter.VIDEO);
 
-        when(mSource.getItems()).thenReturn(CollectionUtil.newArrayList(item1, item2));
+        when(mSource.getItems()).thenReturn(Arrays.asList(item1, item2));
         DateOrderedListMutator list = createMutatorWithoutJustNowProvider();
         mModel.addObserver(mObserver);
 
         // Update an item with the same timestamp.
         OfflineItem newItem1 =
                 buildItem("1", buildCalendar(2018, 1, 1, 3), OfflineItemFilter.VIDEO);
-        when(mSource.getItems()).thenReturn(CollectionUtil.newArrayList(newItem1, item2));
+        when(mSource.getItems()).thenReturn(Arrays.asList(newItem1, item2));
         list.onItemUpdated(item1, newItem1);
 
         Assert.assertEquals(3, mModel.size());
@@ -898,14 +896,14 @@ public class DateOrderedListMutatorTest {
         OfflineItem item1 = buildItem("1", buildCalendar(2018, 1, 1, 5), OfflineItemFilter.VIDEO);
         OfflineItem item2 = buildItem("2", buildCalendar(2018, 1, 1, 4), OfflineItemFilter.VIDEO);
 
-        when(mSource.getItems()).thenReturn(CollectionUtil.newArrayList(item1, item2));
+        when(mSource.getItems()).thenReturn(Arrays.asList(item1, item2));
         DateOrderedListMutator list = createMutatorWithoutJustNowProvider();
         mModel.addObserver(mObserver);
 
         // Update an item with the same timestamp.
         OfflineItem newItem1 =
                 buildItem("1", buildCalendar(2018, 1, 1, 3), OfflineItemFilter.IMAGE);
-        when(mSource.getItems()).thenReturn(CollectionUtil.newArrayList(newItem1, item2));
+        when(mSource.getItems()).thenReturn(Arrays.asList(newItem1, item2));
         list.onItemUpdated(item1, newItem1);
 
         Assert.assertEquals(3, mModel.size());
@@ -927,14 +925,14 @@ public class DateOrderedListMutatorTest {
     public void testItemUpdatedDifferentDay() {
         OfflineItem item1 = buildItem("1", buildCalendar(2018, 1, 1, 4), OfflineItemFilter.VIDEO);
 
-        when(mSource.getItems()).thenReturn(CollectionUtil.newArrayList(item1));
+        when(mSource.getItems()).thenReturn(Collections.singletonList(item1));
         DateOrderedListMutator list = createMutatorWithoutJustNowProvider();
         mModel.addObserver(mObserver);
 
         // Update an item with the same timestamp.
         OfflineItem newItem1 =
                 buildItem("1", buildCalendar(2018, 1, 2, 6), OfflineItemFilter.VIDEO);
-        when(mSource.getItems()).thenReturn(CollectionUtil.newArrayList(newItem1));
+        when(mSource.getItems()).thenReturn(Collections.singletonList(newItem1));
         list.onItemUpdated(item1, newItem1);
 
         Assert.assertEquals(2, mModel.size());
@@ -964,8 +962,7 @@ public class DateOrderedListMutatorTest {
         OfflineItem item3 = buildItem("3", buildCalendar(2018, 1, 2, 4), OfflineItemFilter.IMAGE);
         OfflineItem item4 = buildItem("4", buildCalendar(2018, 1, 2, 4), OfflineItemFilter.IMAGE);
         OfflineItem item5 = buildItem("5", buildCalendar(2018, 1, 2, 4), OfflineItemFilter.IMAGE);
-        when(mSource.getItems())
-                .thenReturn(CollectionUtil.newArrayList(item1, item2, item3, item4, item5));
+        when(mSource.getItems()).thenReturn(Arrays.asList(item1, item2, item3, item4, item5));
         TypeOfflineItemFilter typeOfflineItemFilter = new TypeOfflineItemFilter(mSource);
         DateOrderedListMutator mutator = createMutatorWithSource(typeOfflineItemFilter);
         Assert.assertEquals(6, mModel.size());
@@ -994,7 +991,7 @@ public class DateOrderedListMutatorTest {
     public void testPrefetchTabBasic() {
         OfflineItem item1 = buildPrefetchItem("1", buildCalendar(2018, 1, 2, 4));
         OfflineItem item2 = buildPrefetchItem("2", buildCalendar(2018, 1, 1, 5));
-        when(mSource.getItems()).thenReturn(CollectionUtil.newArrayList(item1, item2));
+        when(mSource.getItems()).thenReturn(Arrays.asList(item1, item2));
         DateOrderedListMutator mutator = createMutatorWithoutJustNowProvider();
         mMutationController.onFilterTypeSelected(Filters.FilterType.PREFETCHED);
         mutator.reload();
@@ -1013,7 +1010,7 @@ public class DateOrderedListMutatorTest {
     public void testContentIndexingStandaloneCards() {
         OfflineItem item1 =
                 buildContentIndexedItem("1", buildCalendar(2018, 1, 1, 5), OfflineItemFilter.PAGE);
-        when(mSource.getItems()).thenReturn(CollectionUtil.newArrayList(item1));
+        when(mSource.getItems()).thenReturn(Collections.singletonList(item1));
         DateOrderedListMutator mutator = createMutatorWithoutJustNowProvider();
         mMutationController.onFilterTypeSelected(Filters.FilterType.PREFETCHED);
         mutator.reload();
@@ -1039,7 +1036,7 @@ public class DateOrderedListMutatorTest {
                 buildContentIndexedItem("2", buildCalendar(2018, 1, 3, 4), OfflineItemFilter.AUDIO);
         OfflineItem item3 =
                 buildContentIndexedItem("3", buildCalendar(2018, 1, 3, 5), OfflineItemFilter.AUDIO);
-        when(mSource.getItems()).thenReturn(CollectionUtil.newArrayList(item1, item2, item3));
+        when(mSource.getItems()).thenReturn(Arrays.asList(item1, item2, item3));
         DateOrderedListMutator mutator = createMutatorWithoutJustNowProvider();
         mMutationController.onFilterTypeSelected(Filters.FilterType.PREFETCHED);
         mutator.reload();
@@ -1077,8 +1074,7 @@ public class DateOrderedListMutatorTest {
                 buildContentIndexedItem("3", buildCalendar(2018, 1, 4, 3), OfflineItemFilter.VIDEO);
         OfflineItem item4 =
                 buildContentIndexedItem("4", buildCalendar(2018, 1, 4, 4), OfflineItemFilter.VIDEO);
-        when(mSource.getItems())
-                .thenReturn(CollectionUtil.newArrayList(item1, item2, item3, item4));
+        when(mSource.getItems()).thenReturn(Arrays.asList(item1, item2, item3, item4));
         DateOrderedListMutator mutator = createMutatorWithoutJustNowProvider();
         mMutationController.onFilterTypeSelected(Filters.FilterType.PREFETCHED);
         mutator.reload();
@@ -1097,8 +1093,8 @@ public class DateOrderedListMutatorTest {
 
         // Remove one item. Now there should be only 3 items. The footer should be gone and get
         // replaced by bottom curve.
-        when(mSource.getItems()).thenReturn(CollectionUtil.newArrayList(item2, item3, item4));
-        mutator.onItemsRemoved(CollectionUtil.newArrayList(item1));
+        when(mSource.getItems()).thenReturn(Arrays.asList(item2, item3, item4));
+        mutator.onItemsRemoved(Collections.singletonList(item1));
 
         Assert.assertEquals(8, mModel.size());
         assertOfflineItem(mModel.get(6), buildCalendar(2018, 1, 4, 2), item2);
@@ -1106,8 +1102,8 @@ public class DateOrderedListMutatorTest {
 
         // Remove one more item. Now there should be only 2 items. Now they shouldn't be grouped at
         // all.
-        when(mSource.getItems()).thenReturn(CollectionUtil.newArrayList(item3, item4));
-        mutator.onItemsRemoved(CollectionUtil.newArrayList(item2));
+        when(mSource.getItems()).thenReturn(Arrays.asList(item3, item4));
+        mutator.onItemsRemoved(Collections.singletonList(item2));
         Assert.assertEquals(2, mModel.size());
     }
 

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

@@ -14,151 +14,153 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.robolectric.annotation.Config;
 
-import org.chromium.base.CollectionUtil;
 import org.chromium.base.test.BaseRobolectricTestRunner;
 import org.chromium.components.offline_items_collection.OfflineItem;
 import org.chromium.components.offline_items_collection.OfflineItemShareInfo;
 
+import java.util.Arrays;
+import java.util.Collections;
+
 /** Unit tests for the ShareUtils class. */
 @RunWith(BaseRobolectricTestRunner.class)
 @Config(manifest = Config.NONE)
 public class ShareUtilsTest {
     @Test
     public void testNoContent() {
-        Assert.assertNull(ShareUtils.createIntent(CollectionUtil.newArrayList()));
-        Assert.assertNull(ShareUtils.createIntent(CollectionUtil.newArrayList(
+        Assert.assertNull(ShareUtils.createIntent(Collections.emptyList()));
+        Assert.assertNull(ShareUtils.createIntent(Arrays.asList(
                 createItem(null, "text/plain", "", null), createItem("", "text/plain", "", ""))));
     }
 
     @Test
     public void testAction() {
-        Intent intent = ShareUtils.createIntent(CollectionUtil.newArrayList(
+        Intent intent = ShareUtils.createIntent(Collections.singletonList(
                 createItem("http://www.google.com", "text/plain", "", null)));
         Assert.assertEquals(Intent.ACTION_SEND, intent.getAction());
 
-        intent = ShareUtils.createIntent(CollectionUtil.newArrayList(
-                createItem("http://www.google.com", "text/plain", "", null),
-                createItem("http://www.chrome.com", "text/plain", "", null)));
+        intent = ShareUtils.createIntent(
+                Arrays.asList(createItem("http://www.google.com", "text/plain", "", null),
+                        createItem("http://www.chrome.com", "text/plain", "", null)));
         Assert.assertEquals(Intent.ACTION_SEND, intent.getAction());
 
-        intent = ShareUtils.createIntent(CollectionUtil.newArrayList(
-                createItem("http://www.google.com", "text/plain", "", null),
-                createItem("", "text/plain", "", "http://www.chrome.com")));
+        intent = ShareUtils.createIntent(
+                Arrays.asList(createItem("http://www.google.com", "text/plain", "", null),
+                        createItem("", "text/plain", "", "http://www.chrome.com")));
         Assert.assertEquals(Intent.ACTION_SEND_MULTIPLE, intent.getAction());
 
-        intent = ShareUtils.createIntent(CollectionUtil.newArrayList(
-                createItem("", "text/plain", "", "http://www.google.com"),
-                createItem("", "text/plain", "", "http://www.chrome.com")));
+        intent = ShareUtils.createIntent(
+                Arrays.asList(createItem("", "text/plain", "", "http://www.google.com"),
+                        createItem("", "text/plain", "", "http://www.chrome.com")));
         Assert.assertEquals(Intent.ACTION_SEND_MULTIPLE, intent.getAction());
     }
 
     @Test
     public void testFlags() {
-        Intent intent = ShareUtils.createIntent(CollectionUtil.newArrayList(
+        Intent intent = ShareUtils.createIntent(Collections.singletonList(
                 createItem("http://www.google.com", "text/plain", "", null)));
         Assert.assertNotEquals(0, intent.getFlags() | Intent.FLAG_ACTIVITY_NEW_TASK);
     }
 
     @Test
     public void testExtraText() {
-        Intent intent = ShareUtils.createIntent(CollectionUtil.newArrayList(
+        Intent intent = ShareUtils.createIntent(Collections.singletonList(
                 createItem("http://www.google.com", "text/plain", "", null)));
         Assert.assertEquals("http://www.google.com", intent.getStringExtra(Intent.EXTRA_TEXT));
 
-        intent = ShareUtils.createIntent(CollectionUtil.newArrayList(
+        intent = ShareUtils.createIntent(Arrays.asList(
                 createItem("http://www.google.com", "text/plain", "", null),
                 createItem("http://www.chrome.com", "text/plain", "", "http://www.chrome.com")));
         Assert.assertEquals("http://www.google.com", intent.getStringExtra(Intent.EXTRA_TEXT));
 
-        intent = ShareUtils.createIntent(CollectionUtil.newArrayList(
-                createItem("http://www.google.com", "text/plain", "", null),
-                createItem("http://www.chrome.com", "text/plain", "", null)));
+        intent = ShareUtils.createIntent(
+                Arrays.asList(createItem("http://www.google.com", "text/plain", "", null),
+                        createItem("http://www.chrome.com", "text/plain", "", null)));
         Assert.assertEquals("http://www.google.com\nhttp://www.chrome.com",
                 intent.getStringExtra(Intent.EXTRA_TEXT));
 
-        intent = ShareUtils.createIntent(CollectionUtil.newArrayList(
+        intent = ShareUtils.createIntent(Collections.singletonList(
                 createItem("", "text/plain", "", "http://www.google.com")));
         Assert.assertFalse(intent.hasExtra(Intent.EXTRA_TEXT));
     }
 
     @Test
     public void testExtraSubject() {
-        Intent intent = ShareUtils.createIntent(CollectionUtil.newArrayList(
+        Intent intent = ShareUtils.createIntent(Collections.singletonList(
                 createItem("http://www.google.com", "text/plain", "title", null)));
         Assert.assertEquals("title", intent.getStringExtra(Intent.EXTRA_SUBJECT));
 
-        intent = ShareUtils.createIntent(CollectionUtil.newArrayList(
-                createItem("http://www.google.com", "text/plain", "title1", null),
-                createItem(
-                        "http://www.chrome.com", "text/plain", "title2", "http://www.chrome.com")));
+        intent = ShareUtils.createIntent(
+                Arrays.asList(createItem("http://www.google.com", "text/plain", "title1", null),
+                        createItem("http://www.chrome.com", "text/plain", "title2",
+                                "http://www.chrome.com")));
         Assert.assertFalse(intent.hasExtra(Intent.EXTRA_SUBJECT));
     }
 
     @Test
     public void testExtraStream() {
-        Intent intent = ShareUtils.createIntent(CollectionUtil.newArrayList(
+        Intent intent = ShareUtils.createIntent(Collections.singletonList(
                 createItem("http://www.google.com", "text/plain", "", null)));
         Assert.assertFalse(intent.hasExtra(Intent.EXTRA_STREAM));
         Assert.assertNull(intent.getParcelableArrayListExtra(Intent.EXTRA_STREAM));
 
-        intent = ShareUtils.createIntent(CollectionUtil.newArrayList(
+        intent = ShareUtils.createIntent(Collections.singletonList(
                 createItem("", "text/plain", "", "http://www.google.com")));
         Assert.assertEquals(
                 Uri.parse("http://www.google.com"), intent.getParcelableExtra(Intent.EXTRA_STREAM));
 
-        intent = ShareUtils.createIntent(CollectionUtil.newArrayList(
+        intent = ShareUtils.createIntent(Collections.singletonList(
                 createItem("http://www.google.com", "text/plain", "", "http://www.google.com")));
         Assert.assertEquals(
                 Uri.parse("http://www.google.com"), intent.getParcelableExtra(Intent.EXTRA_STREAM));
 
-        intent = ShareUtils.createIntent(CollectionUtil.newArrayList(
-                createItem("", "text/plain", "", "http://www.google.com"),
-                createItem("http://www.chrome.com", "text/plain", "", "")));
+        intent = ShareUtils.createIntent(
+                Arrays.asList(createItem("", "text/plain", "", "http://www.google.com"),
+                        createItem("http://www.chrome.com", "text/plain", "", "")));
         Assert.assertEquals(
                 Uri.parse("http://www.google.com"), intent.getParcelableExtra(Intent.EXTRA_STREAM));
 
-        intent = ShareUtils.createIntent(CollectionUtil.newArrayList(
+        intent = ShareUtils.createIntent(Arrays.asList(
                 createItem("", "text/plain", "", "http://www.google.com"),
                 createItem("http://www.chrome.com", "text/plain", "", "http://www.chrome.com")));
-        Assert.assertEquals(CollectionUtil.newArrayList(Uri.parse("http://www.google.com"),
+        Assert.assertEquals(Arrays.asList(Uri.parse("http://www.google.com"),
                                     Uri.parse("http://www.chrome.com")),
                 intent.getParcelableArrayListExtra(Intent.EXTRA_STREAM));
 
-        intent = ShareUtils.createIntent(CollectionUtil.newArrayList(
-                createItem("", "text/plain", "", "http://www.google.com"),
-                createItem("", "text/plain", "", "http://www.chrome.com")));
-        Assert.assertEquals(CollectionUtil.newArrayList(Uri.parse("http://www.google.com"),
+        intent = ShareUtils.createIntent(
+                Arrays.asList(createItem("", "text/plain", "", "http://www.google.com"),
+                        createItem("", "text/plain", "", "http://www.chrome.com")));
+        Assert.assertEquals(Arrays.asList(Uri.parse("http://www.google.com"),
                                     Uri.parse("http://www.chrome.com")),
                 intent.getParcelableArrayListExtra(Intent.EXTRA_STREAM));
 
-        intent = ShareUtils.createIntent(CollectionUtil.newArrayList(
+        intent = ShareUtils.createIntent(Collections.singletonList(
                 createItem("http://www.google.com", "text/plain", "", null)));
         Assert.assertFalse(intent.hasExtra(Intent.EXTRA_STREAM));
         Assert.assertNull(intent.getParcelableArrayListExtra(Intent.EXTRA_STREAM));
 
-        intent = ShareUtils.createIntent(CollectionUtil.newArrayList(
-                createItem("http://www.google.com", "text/plain", "", null),
-                createItem("http://www.chrome.com", "text/plain", "", null)));
+        intent = ShareUtils.createIntent(
+                Arrays.asList(createItem("http://www.google.com", "text/plain", "", null),
+                        createItem("http://www.chrome.com", "text/plain", "", null)));
         Assert.assertFalse(intent.hasExtra(Intent.EXTRA_STREAM));
         Assert.assertNull(intent.getParcelableArrayListExtra(Intent.EXTRA_STREAM));
     }
 
     @Test
     public void testType() {
-        Intent intent = ShareUtils.createIntent(CollectionUtil.newArrayList(
+        Intent intent = ShareUtils.createIntent(Collections.singletonList(
                 createItem("http://www.google.com", "text/plain", "", null)));
         Assert.assertEquals(Intent.normalizeMimeType("text/plain"), intent.getType());
 
-        intent = ShareUtils.createIntent(CollectionUtil.newArrayList(
-                createItem("http://www.google.com", "text/plain", "", null),
-                createItem("http://www.google.com", "text/plain", "", null),
-                createItem("http://www.google.com", "text/html", "", null),
-                createItem("http://www.google.com", "text/html", "", null)));
+        intent = ShareUtils.createIntent(
+                Arrays.asList(createItem("http://www.google.com", "text/plain", "", null),
+                        createItem("http://www.google.com", "text/plain", "", null),
+                        createItem("http://www.google.com", "text/html", "", null),
+                        createItem("http://www.google.com", "text/html", "", null)));
         Assert.assertEquals(Intent.normalizeMimeType("text/*"), intent.getType());
 
-        intent = ShareUtils.createIntent(CollectionUtil.newArrayList(
-                createItem("http://www.google.com", "text/plain", "", null),
-                createItem("http://www.google.com", "application/octet-stream", "", null)));
+        intent = ShareUtils.createIntent(
+                Arrays.asList(createItem("http://www.google.com", "text/plain", "", null),
+                        createItem("http://www.google.com", "application/octet-stream", "", null)));
         Assert.assertEquals(Intent.normalizeMimeType("*/*"), intent.getType());
     }
 
@@ -174,4 +176,4 @@ public class ShareUtilsTest {
 
         return Pair.create(item, info);
     }
-}
+}
\ No newline at end of file

chrome/android/junit/src/org/chromium/chrome/browser/feedback/ChromeFeedbackCollectorTest.java

@@ -44,6 +44,7 @@ import org.chromium.base.test.util.Feature;
 import org.chromium.chrome.browser.profiles.Profile;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
 
@@ -94,7 +95,7 @@ public class ChromeFeedbackCollectorTest {
         Pair<String, String> logs1 = Pair.create(KEY_4, VALUE_4);
         Pair<String, String> logs2 = Pair.create(KEY_5, VALUE_5);
 
-        return CollectionUtil.newArrayList(new MockFeedbackSource(map1, null),
+        return Arrays.asList(new MockFeedbackSource(map1, null),
                 new MockFeedbackSource(map2, logs1), new MockFeedbackSource(null, logs2),
                 new MockFeedbackSource(null, null));
     }
@@ -121,7 +122,7 @@ public class ChromeFeedbackCollectorTest {
         Pair<String, String> logs1 = Pair.create(KEY_9, VALUE_9);
         Pair<String, String> logs2 = Pair.create(KEY_10, VALUE_10);
 
-        return CollectionUtil.newArrayList(new MockAsyncFeedbackSource(map1, null),
+        return Arrays.asList(new MockAsyncFeedbackSource(map1, null),
                 new MockAsyncFeedbackSource(map2, logs1), new MockAsyncFeedbackSource(null, logs2),
                 new MockAsyncFeedbackSource(null, null));
     }
@@ -340,8 +341,8 @@ public class ChromeFeedbackCollectorTest {
             @Override
             protected List<FeedbackSource> buildSynchronousFeedbackSources(
                     ChromeFeedbackCollector.InitParams initParams) {
-                List<FeedbackSource> list =
-                        ChromeFeedbackCollectorTest.buildSynchronousFeedbackSources();
+                ArrayList<FeedbackSource> list = new ArrayList<>(
+                        ChromeFeedbackCollectorTest.buildSynchronousFeedbackSources());
                 list.add(new FeedbackContextFeedbackSource(FEEDBACK_CONTEXT));
                 return list;
             }

chrome/android/junit/src/org/chromium/chrome/browser/search_engines/settings/SearchEngineAdapterTest.java

@@ -13,11 +13,11 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.robolectric.annotation.Config;
 
-import org.chromium.base.CollectionUtil;
 import org.chromium.base.test.BaseRobolectricTestRunner;
 import org.chromium.components.search_engines.TemplateUrl;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 
 /** Unit tests for {@link SearchEngineAdapter}. */
@@ -47,8 +47,8 @@ public class SearchEngineAdapterTest {
         MockTemplateUrl custom4 = new MockTemplateUrl(104, "custom_keyword4", currentTime - 3);
         MockTemplateUrl custom5 = new MockTemplateUrl(105, "custom_keyword5", currentTime - 4);
 
-        List<TemplateUrl> templateUrls = CollectionUtil.newArrayList(
-                dse, prepopulated1, prepopulated2, prepopulated3, custom1, custom2, custom3);
+        ArrayList<TemplateUrl> templateUrls = new ArrayList<>(Arrays.asList(
+                dse, prepopulated1, prepopulated2, prepopulated3, custom1, custom2, custom3));
 
         List<TemplateUrl> output = new ArrayList<>(templateUrls);
         SearchEngineAdapter.sortAndFilterUnnecessaryTemplateUrl(output, dse);
@@ -81,8 +81,8 @@ public class SearchEngineAdapterTest {
 
         // Specify an older custom search engine as default, and ensure it is included as well as
         // the 3 most recent custom search engines.
-        output = CollectionUtil.newArrayList(
-                prepopulated1, prepopulated2, custom1, custom2, custom3, custom4, custom5);
+        output = new ArrayList<>(Arrays.asList(
+                prepopulated1, prepopulated2, custom1, custom2, custom3, custom4, custom5));
         SearchEngineAdapter.sortAndFilterUnnecessaryTemplateUrl(output, custom2);
         assertThat(
                 output, contains(prepopulated1, prepopulated2, custom2, custom3, custom4, custom5));
@@ -103,8 +103,7 @@ public class SearchEngineAdapterTest {
         prepopulated3.isPrepopulated = true;
         prepopulated3.prepopulatedId = 4;
 
-        List<TemplateUrl> templateUrls =
-                CollectionUtil.newArrayList(prepopulated1, prepopulated2, prepopulated3);
+        List<TemplateUrl> templateUrls = Arrays.asList(prepopulated1, prepopulated2, prepopulated3);
 
         List<TemplateUrl> output = new ArrayList<>(templateUrls);
         SearchEngineAdapter.sortAndFilterUnnecessaryTemplateUrl(output, prepopulated1);

components/browser_ui/notifications/android/java/src/org/chromium/components/browser_ui/notifications/channels/ChannelsInitializer.java

@@ -125,7 +125,7 @@ public class ChannelsInitializer {
 
     private void ensureInitializedWithEnabledState(String channelId, boolean enabled) {
         Collection<String> groupIds = Collections.emptyList();
-        Collection<String> channelIds = CollectionUtil.newArrayList(channelId);
+        Collection<String> channelIds = Collections.singletonList(channelId);
         ensureInitializedWithEnabledState(groupIds, channelIds, enabled);
     }
 

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

@@ -7,6 +7,7 @@ package org.chromium.components.offline_items_collection;
 import org.chromium.base.Callback;
 
 import java.util.ArrayList;
+import java.util.List;
 
 /**
  * This interface is a Java counterpart to the C++ OfflineContentProvider
@@ -19,7 +20,7 @@ public interface OfflineContentProvider {
      */
     interface Observer {
         /** See OfflineContentProvider::Observer::OnItemsAdded(...). */
-        void onItemsAdded(ArrayList<OfflineItem> items);
+        void onItemsAdded(List<OfflineItem> items);
 
         /** See OfflineContentProvider::Observer::OnItemRemoved(...). */
         void onItemRemoved(ContentId id);