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

Unified Diff: components/invalidation/android/java/src/org/chromium/components/invalidation/InvalidationClientService.java

Issue 1138013008: [Sync] Make it impossible to get a reference to AndroidSyncSettings. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase and address nit. Created 5 years, 7 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: components/invalidation/android/java/src/org/chromium/components/invalidation/InvalidationClientService.java
diff --git a/components/invalidation/android/java/src/org/chromium/components/invalidation/InvalidationClientService.java b/components/invalidation/android/java/src/org/chromium/components/invalidation/InvalidationClientService.java
index 0c85e4aacdd7e5367c0e0c48b2b6f97be0f28ae3..ced6f51779917f020d6642cfe22afd7ef7a63ca9 100644
--- a/components/invalidation/android/java/src/org/chromium/components/invalidation/InvalidationClientService.java
+++ b/components/invalidation/android/java/src/org/chromium/components/invalidation/InvalidationClientService.java
@@ -444,7 +444,7 @@ public class InvalidationClientService extends AndroidListener {
bundle.putString("payload", (payload == null) ? "" : payload);
}
Account account = ChromeSigninController.get(this).getSignedInUser();
- String contractAuthority = AndroidSyncSettings.get(this).getContractAuthority();
+ String contractAuthority = AndroidSyncSettings.getContractAuthority(this);
requestSyncFromContentResolver(bundle, account, contractAuthority);
}
@@ -472,7 +472,7 @@ public class InvalidationClientService extends AndroidListener {
/** Returns whether sync is enabled. LLocal method so it can be overridden in tests. */
@VisibleForTesting
boolean isSyncEnabled() {
- return AndroidSyncSettings.get(getApplicationContext()).isSyncEnabled();
+ return AndroidSyncSettings.isSyncEnabled(getApplicationContext());
}
/**

Powered by Google App Engine
This is Rietveld 408576698