chrome/android/java/src/org/chromium/chrome/browser/invalidation/InvalidationController.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: chrome/android/java/src/org/chromium/chrome/browser/invalidation/InvalidationController.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 | « chrome/android/java/src/org/chromium/chrome/browser/identity/UuidBasedUniqueIdentificationGenerator.java ('k') | chrome/android/java/src/org/chromium/chrome/browser/omnibox/AutocompleteController.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/android/java/src/org/chromium/chrome/browser/invalidation/InvalidationController.java

diff --git a/chrome/android/java/src/org/chromium/chrome/browser/invalidation/InvalidationController.java b/chrome/android/java/src/org/chromium/chrome/browser/invalidation/InvalidationController.java

index 8e3cac34a841f81c5c37116e3ee967ea96494b1a..19bcdab4725b20e44cc74aad97a15ba9115330fb 100644

--- a/chrome/android/java/src/org/chromium/chrome/browser/invalidation/InvalidationController.java

+++ b/chrome/android/java/src/org/chromium/chrome/browser/invalidation/InvalidationController.java

@@ -8,12 +8,10 @@ import android.accounts.Account;

import android.content.Context;

import android.content.Intent;

-import com.google.common.annotations.VisibleForTesting;

-import com.google.common.base.Preconditions;

import org.chromium.base.ApplicationState;

import org.chromium.base.ApplicationStatus;

import org.chromium.base.CalledByNative;

+import org.chromium.base.VisibleForTesting;

import org.chromium.sync.internal_api.pub.base.ModelType;

import org.chromium.sync.notifier.InvalidationClientNameProvider;

import org.chromium.sync.notifier.InvalidationIntentProtocol;

@@ -119,7 +117,9 @@ public class InvalidationController implements ApplicationStatus.ApplicationStat

@VisibleForTesting

InvalidationController(Context context) {

- mContext = Preconditions.checkNotNull(context.getApplicationContext());

+ Context appContext = context.getApplicationContext();

+ if (appContext == null) throw new NullPointerException("Unable to get application context");

+ mContext = appContext;

ApplicationStatus.registerApplicationStateListener(this);

}