sync/android/java/src/org/chromium/sync/notifier/InvalidationPreferences.java - Issue 565743002: Remove most usages of guava.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: sync/android/java/src/org/chromium/sync/notifier/InvalidationPreferences.java

Issue 565743002: Remove most usages of guava. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Rebased Created 6 years, 3 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

« no previous file with comments | « sync/android/java/src/org/chromium/sync/notifier/InvalidationIntentProtocol.java ('k') | sync/android/java/src/org/chromium/sync/notifier/InvalidationService.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: sync/android/java/src/org/chromium/sync/notifier/InvalidationPreferences.java

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 79173747e1fcf986c96998dd9cb4427456123812..c3192ef210003ba062fb0ba8384a93f1b6a5af09 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. */