From 56f97b71a4a88d7d016fcf4b1b3d37bc56691e35 Mon Sep 17 00:00:00 2001 From: nyquist Date: Fri, 12 Sep 2014 11:42:39 -0700 Subject: Remove most usages of guava. This CL removes most usages of the guava library. TBR=thakis@chromium.org,brettw@chromium.org,yfriedman@chromium.org BUG=412673 Review URL: https://codereview.chromium.org/565743002 Cr-Commit-Position: refs/heads/master@{#294620} --- .../src/org/chromium/sync/internal_api/pub/base/ModelType.java | 2 +- .../src/org/chromium/sync/notifier/InvalidationIntentProtocol.java | 7 ++++--- .../src/org/chromium/sync/notifier/InvalidationPreferences.java | 7 +++++-- .../java/src/org/chromium/sync/notifier/InvalidationService.java | 2 +- .../java/src/org/chromium/sync/notifier/SyncStatusHelper.java | 3 +-- .../java/src/org/chromium/sync/signin/AccountManagerHelper.java | 3 +-- .../java/src/org/chromium/sync/signin/ChromeSigninController.java | 2 +- 7 files changed, 14 insertions(+), 12 deletions(-) (limited to 'sync/android') 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 354b17d..abeac4d 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 @@ -6,11 +6,11 @@ package org.chromium.sync.internal_api.pub.base; import android.util.Log; -import com.google.common.annotations.VisibleForTesting; import com.google.ipc.invalidation.external.client.types.ObjectId; import com.google.protos.ipc.invalidation.Types; import org.chromium.base.FieldTrialList; +import org.chromium.base.VisibleForTesting; import org.chromium.base.library_loader.LibraryLoader; import java.util.Collection; diff --git a/sync/android/java/src/org/chromium/sync/notifier/InvalidationIntentProtocol.java b/sync/android/java/src/org/chromium/sync/notifier/InvalidationIntentProtocol.java index 11cc4c4..3d96e03 100644 --- a/sync/android/java/src/org/chromium/sync/notifier/InvalidationIntentProtocol.java +++ b/sync/android/java/src/org/chromium/sync/notifier/InvalidationIntentProtocol.java @@ -7,7 +7,6 @@ package org.chromium.sync.notifier; import android.accounts.Account; import android.content.Intent; -import com.google.common.base.Preconditions; import com.google.ipc.invalidation.external.client.types.ObjectId; import com.google.protos.ipc.invalidation.Types; @@ -87,8 +86,10 @@ public class InvalidationIntentProtocol { */ public static Intent createRegisterIntent(Account account, int[] objectSources, String[] objectNames) { - Preconditions.checkArgument(objectSources.length == objectNames.length, - "objectSources and objectNames must have the same length"); + if (objectSources.length != objectNames.length) { + throw new IllegalArgumentException( + "objectSources and objectNames must have the same length"); + } // Add all non-Sync objects to new lists. ArrayList sources = new ArrayList(); diff --git a/sync/android/java/src/org/chromium/sync/notifier/InvalidationPreferences.java b/sync/android/java/src/org/chromium/sync/notifier/InvalidationPreferences.java index 7917374..c3192ef2 100644 --- a/sync/android/java/src/org/chromium/sync/notifier/InvalidationPreferences.java +++ b/sync/android/java/src/org/chromium/sync/notifier/InvalidationPreferences.java @@ -11,10 +11,11 @@ import android.preference.PreferenceManager; import android.util.Base64; import android.util.Log; -import com.google.common.annotations.VisibleForTesting; import com.google.common.base.Preconditions; import com.google.ipc.invalidation.external.client.types.ObjectId; +import org.chromium.base.VisibleForTesting; + import java.util.Collection; import java.util.HashSet; import java.util.Set; @@ -79,7 +80,9 @@ public class InvalidationPreferences { private final Context mContext; public InvalidationPreferences(Context context) { - this.mContext = Preconditions.checkNotNull(context.getApplicationContext()); + Context appContext = context.getApplicationContext(); + if (appContext == null) throw new NullPointerException("Unable to get application context"); + mContext = appContext; } /** Returns a new {@link EditContext} to modify the preferences managed by this class. */ diff --git a/sync/android/java/src/org/chromium/sync/notifier/InvalidationService.java b/sync/android/java/src/org/chromium/sync/notifier/InvalidationService.java index f55f629..6986f5f 100644 --- a/sync/android/java/src/org/chromium/sync/notifier/InvalidationService.java +++ b/sync/android/java/src/org/chromium/sync/notifier/InvalidationService.java @@ -11,7 +11,6 @@ import android.content.Intent; import android.os.Bundle; import android.util.Log; -import com.google.common.annotations.VisibleForTesting; import com.google.ipc.invalidation.external.client.InvalidationListener.RegistrationState; import com.google.ipc.invalidation.external.client.contrib.AndroidListener; import com.google.ipc.invalidation.external.client.types.ErrorInfo; @@ -21,6 +20,7 @@ import com.google.protos.ipc.invalidation.Types.ClientType; import org.chromium.base.ApplicationStatus; import org.chromium.base.CollectionUtil; +import org.chromium.base.VisibleForTesting; import org.chromium.sync.internal_api.pub.base.ModelType; import org.chromium.sync.notifier.InvalidationPreferences.EditContext; import org.chromium.sync.signin.AccountManagerHelper; diff --git a/sync/android/java/src/org/chromium/sync/notifier/SyncStatusHelper.java b/sync/android/java/src/org/chromium/sync/notifier/SyncStatusHelper.java index 569848f..5178387 100644 --- a/sync/android/java/src/org/chromium/sync/notifier/SyncStatusHelper.java +++ b/sync/android/java/src/org/chromium/sync/notifier/SyncStatusHelper.java @@ -10,9 +10,8 @@ import android.content.Context; import android.content.SyncStatusObserver; import android.os.StrictMode; -import com.google.common.annotations.VisibleForTesting; - import org.chromium.base.ObserverList; +import org.chromium.base.VisibleForTesting; import org.chromium.sync.signin.AccountManagerHelper; import org.chromium.sync.signin.ChromeSigninController; diff --git a/sync/android/java/src/org/chromium/sync/signin/AccountManagerHelper.java b/sync/android/java/src/org/chromium/sync/signin/AccountManagerHelper.java index e8d89d9..be76287 100644 --- a/sync/android/java/src/org/chromium/sync/signin/AccountManagerHelper.java +++ b/sync/android/java/src/org/chromium/sync/signin/AccountManagerHelper.java @@ -18,9 +18,8 @@ import android.os.AsyncTask; import android.os.Bundle; import android.util.Log; -import com.google.common.annotations.VisibleForTesting; - import org.chromium.base.ThreadUtils; +import org.chromium.base.VisibleForTesting; import org.chromium.net.NetworkChangeNotifier; import java.io.IOException; diff --git a/sync/android/java/src/org/chromium/sync/signin/ChromeSigninController.java b/sync/android/java/src/org/chromium/sync/signin/ChromeSigninController.java index a1f6f85..771ce77 100644 --- a/sync/android/java/src/org/chromium/sync/signin/ChromeSigninController.java +++ b/sync/android/java/src/org/chromium/sync/signin/ChromeSigninController.java @@ -10,11 +10,11 @@ import android.os.AsyncTask; import android.preference.PreferenceManager; import android.util.Log; -import com.google.common.annotations.VisibleForTesting; import com.google.ipc.invalidation.external.client.contrib.MultiplexingGcmListener; import org.chromium.base.CommandLine; import org.chromium.base.ObserverList; +import org.chromium.base.VisibleForTesting; import org.chromium.sync.SyncSwitches; public class ChromeSigninController { -- cgit v1.1