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

sync/android/javatests/src/org/chromium/sync/notifier/TestableInvalidationService.java

Index: sync/android/javatests/src/org/chromium/sync/notifier/TestableInvalidationService.java
diff --git a/sync/android/javatests/src/org/chromium/sync/notifier/TestableInvalidationService.java b/sync/android/javatests/src/org/chromium/sync/notifier/TestableInvalidationService.java
index 9614a103388cbf3f94215be75b14fcd57b3ccefa..aabf6da227eaebda4b17acc865b03f81d23ac074 100644
--- a/sync/android/javatests/src/org/chromium/sync/notifier/TestableInvalidationService.java
+++ b/sync/android/javatests/src/org/chromium/sync/notifier/TestableInvalidationService.java
@@ -4,15 +4,16 @@
 
 package org.chromium.sync.notifier;
 
-import com.google.common.collect.Lists;
-import com.google.ipc.invalidation.external.client.types.AckHandle;
-import com.google.ipc.invalidation.external.client.types.ObjectId;
-
 import android.accounts.Account;
 import android.content.ComponentName;
 import android.content.Intent;
 import android.os.Bundle;
 
+import com.google.ipc.invalidation.external.client.types.ObjectId;
+
+import org.chromium.base.CollectionUtil;
+
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -23,18 +24,18 @@ import java.util.List;
  */
 public class TestableInvalidationService extends InvalidationService {
     /** Object ids given to {@link #register}, one list element per call. */
-    final List<List<ObjectId>> mRegistrations = Lists.newArrayList();
+    final List<List<ObjectId>> mRegistrations = new ArrayList<List<ObjectId>>();
 
     /** Object ids given to {@link #unregister}, one list element per call. */
-    final List<List<ObjectId>> mUnregistrations = Lists.newArrayList();
+    final List<List<ObjectId>> mUnregistrations = new ArrayList<List<ObjectId>>();
 
     /** Intents given to {@link #startService}. */
-    final List<Intent> mStartedServices = Lists.newArrayList();
+    final List<Intent> mStartedServices = new ArrayList<Intent>();
 
     /** Bundles given to {@link #requestSyncFromContentResolver}. */
-    final List<Bundle> mRequestedSyncs = Lists.newArrayList();
+    final List<Bundle> mRequestedSyncs = new ArrayList<Bundle>();
 
-    final List<byte[]> mAcknowledgements = Lists.newArrayList();
+    final List<byte[]> mAcknowledgements = new ArrayList<byte[]>();
 
     /** Whether Chrome is in the foreground. */
     private boolean mIsChromeInForeground = false;
@@ -52,13 +53,17 @@ public class TestableInvalidationService extends InvalidationService {
 
     @Override
     public void register(byte[] clientId, Iterable<ObjectId> objectIds) {
-        mRegistrations.add(Lists.newArrayList(objectIds));
+        mRegistrations.add(CollectionUtil.newArrayList(objectIds));
         super.register(clientId, objectIds);
     }
 
     @Override
     public void unregister(byte[] clientId, Iterable<ObjectId> objectIds) {
-        mUnregistrations.add(Lists.newArrayList(objectIds));
+        List<ObjectId> unregistrationsAsList = new ArrayList<ObjectId>();

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

Either:
List<ObjectId> unregistrationsAsList = CollectionUtil.newArrayList(objectIds);

Or:
mUnregistrations.add(CollectionUtil.newArrayList(objectIds));

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

Done.

+        for (ObjectId object: objectIds)
+            unregistrationsAsList.add(object);
+
+        mUnregistrations.add(unregistrationsAsList);
         super.unregister(clientId, objectIds);
     }