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

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

To minimize apk size, minimize dependencies on guava. This removes 7k method definitions from the dex file.
BUG=272790
NOTRY=true

Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=218579

[Yaron, 2013-08-15 05:46:46]

https://codereview.chromium.org/22978010/diff/3001/sync/android/java/src/org/...
File sync/android/java/src/org/chromium/sync/notifier/InvalidationService.java
(right):

https://codereview.chromium.org/22978010/diff/3001/sync/android/java/src/org/...
sync/android/java/src/org/chromium/sync/notifier/InvalidationService.java:355:
regAccumulator.addAll(desiredRegs);
Slight behaviour change. As I'm adding and removing to the original set, if the
original set had values that intersected with existingRegs, they'd be removed
too. In practice this is the same though.

https://codereview.chromium.org/22978010/diff/3001/sync/android/javatests/src...
File
sync/android/javatests/src/org/chromium/sync/notifier/InvalidationServiceTest.java
(right):

https://codereview.chromium.org/22978010/diff/3001/sync/android/javatests/src...
sync/android/javatests/src/org/chromium/sync/notifier/InvalidationServiceTest.java:680:
public static <E> HashSet<E> newHashSet(E... elements) {
I could put these in a util class.

[nyquist, 2013-08-16 16:52:45]

lgtm

I think we should look into creating some of the helper methods as part of
base/collections.

https://codereview.chromium.org/22978010/diff/3001/sync/android/java/src/org/...
File sync/android/java/src/org/chromium/sync/notifier/InvalidationService.java
(right):

https://codereview.chromium.org/22978010/diff/3001/sync/android/java/src/org/...
sync/android/java/src/org/chromium/sync/notifier/InvalidationService.java:355:
regAccumulator.addAll(desiredRegs);
On 2013/08/15 05:46:46, Yaron wrote:
> Slight behaviour change. As I'm adding and removing to the original set, if
the
> original set had values that intersected with existingRegs, they'd be removed
> too. In practice this is the same though.

Yeah. I think this is OK.

https://codereview.chromium.org/22978010/diff/3001/sync/android/javatests/src...
File
sync/android/javatests/src/org/chromium/sync/notifier/InvalidationServiceTest.java
(right):

https://codereview.chromium.org/22978010/diff/3001/sync/android/javatests/src...
sync/android/javatests/src/org/chromium/sync/notifier/InvalidationServiceTest.java:680:
public static <E> HashSet<E> newHashSet(E... elements) {
On 2013/08/15 05:46:46, Yaron wrote:
> I could put these in a util class.

Yes. base/collections?

https://codereview.chromium.org/22978010/diff/10001/sync/android/javatests/sr...
File
sync/android/javatests/src/org/chromium/sync/notifier/TestableInvalidationService.java
(right):

https://codereview.chromium.org/22978010/diff/10001/sync/android/javatests/sr...
sync/android/javatests/src/org/chromium/sync/notifier/TestableInvalidationService.java:54:
List<ObjectId> registrationsAsList = new ArrayList<ObjectId>();
If you end up creating a helper class, it seems like you could use it here too?

[Yaron, 2013-08-20 17:38:27]

Added CollectionUtil and addressed comments

https://codereview.chromium.org/22978010/diff/10001/sync/android/javatests/sr...
File
sync/android/javatests/src/org/chromium/sync/notifier/TestableInvalidationService.java
(right):

https://codereview.chromium.org/22978010/diff/10001/sync/android/javatests/sr...
sync/android/javatests/src/org/chromium/sync/notifier/TestableInvalidationService.java:54:
List<ObjectId> registrationsAsList = new ArrayList<ObjectId>();
On 2013/08/16 16:52:46, nyquist wrote:
> If you end up creating a helper class, it seems like you could use it here
too?

Done.

[nyquist, 2013-08-20 19:01:55]

Almost all my comments are about using your new awesomeness in
org.chromium.base.CollectionUtil.

https://codereview.chromium.org/22978010/diff/31001/base/android/java/src/org...
File base/android/java/src/org/chromium/base/CollectionUtil.java (right):

https://codereview.chromium.org/22978010/diff/31001/base/android/java/src/org...
base/android/java/src/org/chromium/base/CollectionUtil.java:12: * Functions used
for easier initialization of java collections. Inspired by
Nit: Capital J in Java

https://codereview.chromium.org/22978010/diff/31001/base/android/java/src/org...
base/android/java/src/org/chromium/base/CollectionUtil.java:14: * bare-minimum
functionality to avoid bloat. (crbug.com/272790 provides further
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.

https://codereview.chromium.org/22978010/diff/31001/base/android/java/src/org...
base/android/java/src/org/chromium/base/CollectionUtil.java:17: public class
CollectionUtil {
Utility class should be final. Also, add a private default constructor, so
change to something like:

public final class CollectionUtil {
    private CollectionUtil() {}

https://codereview.chromium.org/22978010/diff/31001/content/public/android/ja...
File
content/public/android/java/src/org/chromium/content/browser/DeviceMotionAndOrientation.java
(right):

https://codereview.chromium.org/22978010/diff/31001/content/public/android/ja...
content/public/android/java/src/org/chromium/content/browser/DeviceMotionAndOrientation.java:69:
static final Set<Integer> DEVICE_ORIENTATION_SENSORS = new
HashSet<Integer>(Arrays.asList(
CollectionUtil.newHashSet here and below

https://codereview.chromium.org/22978010/diff/31001/sync/android/java/src/org...
File
sync/android/java/src/org/chromium/sync/notifier/InvalidationController.java
(right):

https://codereview.chromium.org/22978010/diff/31001/sync/android/java/src/org...
sync/android/java/src/org/chromium/sync/notifier/InvalidationController.java:70:
new ArrayList<String>(Arrays.asList(selectedTypesArray)));
CollectionUtil.newArrayList

https://codereview.chromium.org/22978010/diff/31001/sync/android/java/src/org...
File sync/android/java/src/org/chromium/sync/notifier/InvalidationService.java
(right):

https://codereview.chromium.org/22978010/diff/31001/sync/android/java/src/org...
sync/android/java/src/org/chromium/sync/notifier/InvalidationService.java:134:
List<ObjectId> objectIdAsList = new ArrayList<ObjectId>();
CollectionUtil.newArrayList here and below.

https://codereview.chromium.org/22978010/diff/31001/sync/android/javatests/sr...
File
sync/android/javatests/src/org/chromium/sync/notifier/InvalidationControllerTest.java
(right):

https://codereview.chromium.org/22978010/diff/31001/sync/android/javatests/sr...
sync/android/javatests/src/org/chromium/sync/notifier/InvalidationControllerTest.java:156:
new HashSet<ModelType>(Arrays.asList(ModelType.BOOKMARK, ModelType.SESSION)));
CollectionUtil.newHashSet here and the three places below

https://codereview.chromium.org/22978010/diff/31001/sync/android/javatests/sr...
File
sync/android/javatests/src/org/chromium/sync/notifier/InvalidationPreferencesTest.java
(right):

https://codereview.chromium.org/22978010/diff/31001/sync/android/javatests/sr...
sync/android/javatests/src/org/chromium/sync/notifier/InvalidationPreferencesTest.java:42:
HashSet<ModelType> expectedTypes = new HashSet<ModelType>(
CollectionUtil.newHashSet here and three places below

https://codereview.chromium.org/22978010/diff/31001/sync/android/javatests/sr...
File
sync/android/javatests/src/org/chromium/sync/notifier/TestableInvalidationService.java
(right):

https://codereview.chromium.org/22978010/diff/31001/sync/android/javatests/sr...
sync/android/javatests/src/org/chromium/sync/notifier/TestableInvalidationService.java:62:
List<ObjectId> unregistrationsAsList = new ArrayList<ObjectId>();
Either:
List<ObjectId> unregistrationsAsList = CollectionUtil.newArrayList(objectIds);

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

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

Looks cleaner, thanks.

https://codereview.chromium.org/22978010/diff/31001/base/android/java/src/org...
File base/android/java/src/org/chromium/base/CollectionUtil.java (right):

https://codereview.chromium.org/22978010/diff/31001/base/android/java/src/org...
base/android/java/src/org/chromium/base/CollectionUtil.java:12: * Functions used
for easier initialization of java collections. Inspired by
On 2013/08/20 19:01:57, nyquist wrote:
> Nit: Capital J in Java

Done.

https://codereview.chromium.org/22978010/diff/31001/base/android/java/src/org...
base/android/java/src/org/chromium/base/CollectionUtil.java:14: * bare-minimum
functionality to avoid bloat. (crbug.com/272790 provides further
On 2013/08/20 19:01:57, nyquist wrote:
> Nit: Personally I prefer prefixing http://crbug.com links with the scheme, so
they are
> clickable in most tools, but up to you. The codebase is littered with both
> types.

Done.

https://codereview.chromium.org/22978010/diff/31001/base/android/java/src/org...
base/android/java/src/org/chromium/base/CollectionUtil.java:17: public class
CollectionUtil {
On 2013/08/20 19:01:57, nyquist wrote:
> Utility class should be final. Also, add a private default constructor, so
> change to something like:
> 
> public final class CollectionUtil {
>     private CollectionUtil() {}

Done.

https://codereview.chromium.org/22978010/diff/31001/content/public/android/ja...
File
content/public/android/java/src/org/chromium/content/browser/DeviceMotionAndOrientation.java
(right):

https://codereview.chromium.org/22978010/diff/31001/content/public/android/ja...
content/public/android/java/src/org/chromium/content/browser/DeviceMotionAndOrientation.java:69:
static final Set<Integer> DEVICE_ORIENTATION_SENSORS = new
HashSet<Integer>(Arrays.asList(
On 2013/08/20 19:01:57, nyquist wrote:
> CollectionUtil.newHashSet here and below

Done.

https://codereview.chromium.org/22978010/diff/31001/sync/android/java/src/org...
File
sync/android/java/src/org/chromium/sync/notifier/InvalidationController.java
(right):

https://codereview.chromium.org/22978010/diff/31001/sync/android/java/src/org...
sync/android/java/src/org/chromium/sync/notifier/InvalidationController.java:70:
new ArrayList<String>(Arrays.asList(selectedTypesArray)));
On 2013/08/20 19:01:57, nyquist wrote:
> CollectionUtil.newArrayList

Done.

https://codereview.chromium.org/22978010/diff/31001/sync/android/java/src/org...
File sync/android/java/src/org/chromium/sync/notifier/InvalidationService.java
(right):

https://codereview.chromium.org/22978010/diff/31001/sync/android/java/src/org...
sync/android/java/src/org/chromium/sync/notifier/InvalidationService.java:134:
List<ObjectId> objectIdAsList = new ArrayList<ObjectId>();
On 2013/08/20 19:01:57, nyquist wrote:
> CollectionUtil.newArrayList here and below.

Done.

https://codereview.chromium.org/22978010/diff/31001/sync/android/javatests/sr...
File
sync/android/javatests/src/org/chromium/sync/notifier/InvalidationControllerTest.java
(right):

https://codereview.chromium.org/22978010/diff/31001/sync/android/javatests/sr...
sync/android/javatests/src/org/chromium/sync/notifier/InvalidationControllerTest.java:156:
new HashSet<ModelType>(Arrays.asList(ModelType.BOOKMARK, ModelType.SESSION)));
On 2013/08/20 19:01:57, nyquist wrote:
> CollectionUtil.newHashSet here and the three places below

Done.

https://codereview.chromium.org/22978010/diff/31001/sync/android/javatests/sr...
File
sync/android/javatests/src/org/chromium/sync/notifier/InvalidationPreferencesTest.java
(right):

https://codereview.chromium.org/22978010/diff/31001/sync/android/javatests/sr...
sync/android/javatests/src/org/chromium/sync/notifier/InvalidationPreferencesTest.java:42:
HashSet<ModelType> expectedTypes = new HashSet<ModelType>(
On 2013/08/20 19:01:57, nyquist wrote:
> CollectionUtil.newHashSet here and three places below

Done.

https://codereview.chromium.org/22978010/diff/31001/sync/android/javatests/sr...
File
sync/android/javatests/src/org/chromium/sync/notifier/TestableInvalidationService.java
(right):

https://codereview.chromium.org/22978010/diff/31001/sync/android/javatests/sr...
sync/android/javatests/src/org/chromium/sync/notifier/TestableInvalidationService.java:62:
List<ObjectId> unregistrationsAsList = new ArrayList<ObjectId>();
On 2013/08/20 19:01:57, nyquist wrote:
> Either:
> List<ObjectId> unregistrationsAsList = CollectionUtil.newArrayList(objectIds);
> 
> Or:
> mUnregistrations.add(CollectionUtil.newArrayList(objectIds));

Done.

[Yaron, 2013-08-20 23:52:41]

Landing with no-try (only cosmetic changes from previous patchset which was
green on andriod bots)

[commit-bot: I haz the power, 2013-08-20 23:53:54]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/yfriedman@chromium.org/22978010/13009

[commit-bot: I haz the power, 2013-08-20 23:57:20]

Change committed as 218579