[Android] Remove all usage of com.google.common.collect

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

Index: base/android/java/src/org/chromium/base/CollectionUtil.java
diff --git a/base/android/java/src/org/chromium/base/JavaHandlerThread.java b/base/android/java/src/org/chromium/base/CollectionUtil.java
similarity index 19%
copy from base/android/java/src/org/chromium/base/JavaHandlerThread.java
copy to base/android/java/src/org/chromium/base/CollectionUtil.java
index 5f9960e53ce3245ba92b5ff22f1bbbb977343000..f5ae50ac42d1733baff8bd6d99ee1f1dde286ebe 100644
--- a/base/android/java/src/org/chromium/base/JavaHandlerThread.java
+++ b/base/android/java/src/org/chromium/base/CollectionUtil.java
@@ -4,38 +4,33 @@
 
 package org.chromium.base;
 
-import android.os.Handler;
-import android.os.HandlerThread;
-import android.os.Looper;
-import android.os.Message;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashSet;
 
 /**
- * This class is an internal detail of the native counterpart.
- * It is instantiated and owned by the native object.
+ * Functions used for easier initialization of java collections. Inspired by

[nyquist, 2013/08/20 19:01:57]

Nit: Capital J in Java

[Yaron, 2013/08/20 23:41:31]

Done.

+ * functionality in com.google.common.collect in Guava but cherry-picked to
+ * bare-minimum functionality to avoid bloat. (crbug.com/272790 provides further

[nyquist, 2013/08/20 19:01:57]

Nit: Personally I prefer prefixing crbug.com links with the scheme, so they are
clickable in most tools, but up to you. The codebase is littered with both
types.

[Yaron, 2013/08/20 23:41:31]

Done.

+ * details)
  */
-@JNINamespace("base::android")
-class JavaHandlerThread {
-    final HandlerThread mThread;
-
-    private JavaHandlerThread(String name) {
-        mThread = new HandlerThread(name);
+public class CollectionUtil {

[nyquist, 2013/08/20 19:01:57]

Utility class should be final. Also, add a private default constructor, so
change to something like:

public final class CollectionUtil {
    private CollectionUtil() {}

[Yaron, 2013/08/20 23:41:31]

Done.

+    public static <E> HashSet<E> newHashSet(E... elements) {
+        HashSet<E> set = new HashSet<E>(elements.length);
+        Collections.addAll(set, elements);
+        return set;
     }
 
-    @CalledByNative
-    private static JavaHandlerThread create(String name) {
-        return new JavaHandlerThread(name);
+    public static <E> ArrayList<E> newArrayList(E... elements) {
+        ArrayList<E> list = new ArrayList<E>(elements.length);
+        Collections.addAll(list, elements);
+        return list;
     }
 
-    @CalledByNative
-    private void start(final int nativeThread, final int nativeEvent) {
-        mThread.start();
-        new Handler(mThread.getLooper()).post(new Runnable() {
-            @Override
-            public void run() {
-                nativeInitializeThread(nativeThread, nativeEvent);
-            }
-        });
+    public static <E> ArrayList<E> newArrayList(Iterable<E> iterable) {
+        ArrayList<E> list = new ArrayList<E>();
+        for (E element : iterable)
+            list.add(element);
+        return list;
     }
-
-    private native void nativeInitializeThread(int nativeJavaHandlerThread, int nativeEvent);
 }