Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(429)

Unified Diff: sync/android/java/src/org/chromium/sync/internal_api/pub/base/ModelType.java

Issue 22978010: [Android] Remove all usage of com.google.common.collect (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: nyquist fixes Created 7 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: sync/android/java/src/org/chromium/sync/internal_api/pub/base/ModelType.java
diff --git a/sync/android/java/src/org/chromium/sync/internal_api/pub/base/ModelType.java b/sync/android/java/src/org/chromium/sync/internal_api/pub/base/ModelType.java
index afec46cb480f169fa649e1d44a5815f135d22e16..638858830bd11fae951f8d5a23755892c074145d 100644
--- a/sync/android/java/src/org/chromium/sync/internal_api/pub/base/ModelType.java
+++ b/sync/android/java/src/org/chromium/sync/internal_api/pub/base/ModelType.java
@@ -7,11 +7,12 @@ package org.chromium.sync.internal_api.pub.base;
import android.util.Log;
import com.google.common.annotations.VisibleForTesting;
-import com.google.common.collect.Sets;
import com.google.ipc.invalidation.external.client.types.ObjectId;
import com.google.protos.ipc.invalidation.Types;
import java.util.Collection;
+import java.util.EnumSet;
+import java.util.HashSet;
import java.util.Set;
/**
@@ -122,9 +123,9 @@ public enum ModelType {
*/
public static Set<ModelType> syncTypesToModelTypes(Collection<String> syncTypes) {
if (syncTypes.contains(ALL_TYPES_TYPE)) {
- return Sets.newHashSet(ModelType.values());
+ return EnumSet.allOf(ModelType.class);
} else {
- Set<ModelType> modelTypes = Sets.newHashSetWithExpectedSize(syncTypes.size());
+ Set<ModelType> modelTypes = new HashSet<ModelType>(syncTypes.size());
for (String syncType : syncTypes) {
try {
modelTypes.add(valueOf(syncType));
@@ -152,7 +153,7 @@ public enum ModelType {
* This strips out any {@link ModelType} that is not an invalidation type.
*/
public static Set<ObjectId> modelTypesToObjectIds(Set<ModelType> modelTypes) {
- Set<ObjectId> objectIds = Sets.newHashSetWithExpectedSize(modelTypes.size());
+ Set<ObjectId> objectIds = new HashSet<ObjectId>(modelTypes.size());
for (ModelType modelType : modelTypes) {
if (!modelType.mNonInvalidationType) {
objectIds.add(modelType.toObjectId());
@@ -163,7 +164,7 @@ public enum ModelType {
/** Converts a set of {@link ModelType} to a set of string names. */
public static Set<String> modelTypesToSyncTypes(Set<ModelType> modelTypes) {
- Set<String> objectIds = Sets.newHashSetWithExpectedSize(modelTypes.size());
+ Set<String> objectIds = new HashSet<String>(modelTypes.size());
for (ModelType modelType : modelTypes) {
objectIds.add(modelType.toString());
}

Powered by Google App Engine
This is Rietveld 408576698