Index: components/invalidation/impl/android/java/src/org/chromium/components/invalidation/InvalidationService.java |
diff --git a/components/invalidation/impl/android/java/src/org/chromium/components/invalidation/InvalidationService.java b/components/invalidation/impl/android/java/src/org/chromium/components/invalidation/InvalidationService.java |
index 308b7360d1ec4ba30d8180c5d860627b3c514731..a6437337ef3bc0d219787c702ea0c6f25803aa84 100644 |
--- a/components/invalidation/impl/android/java/src/org/chromium/components/invalidation/InvalidationService.java |
+++ b/components/invalidation/impl/android/java/src/org/chromium/components/invalidation/InvalidationService.java |
@@ -5,12 +5,12 @@ |
package org.chromium.components.invalidation; |
import android.accounts.Account; |
-import android.content.Context; |
import android.content.Intent; |
import com.google.protos.ipc.invalidation.Types; |
import org.chromium.base.BuildInfo; |
+import org.chromium.base.ContextUtils; |
import org.chromium.base.Log; |
import org.chromium.base.ThreadUtils; |
import org.chromium.base.VisibleForTesting; |
@@ -27,17 +27,11 @@ import org.chromium.components.sync.notifier.InvalidationPreferences; |
*/ |
@JNINamespace("invalidation") |
public class InvalidationService { |
- private final Context mContext; |
- |
private final long mNativeInvalidationServiceAndroid; |
private static final String TAG = "cr_invalidation"; |
- private InvalidationService(Context context, long nativeInvalidationServiceAndroid) { |
- mContext = context.getApplicationContext(); |
- if (mContext == null) { |
- throw new NullPointerException("mContext is null."); |
- } |
+ private InvalidationService(long nativeInvalidationServiceAndroid) { |
mNativeInvalidationServiceAndroid = nativeInvalidationServiceAndroid; |
} |
@@ -53,10 +47,9 @@ public class InvalidationService { |
} |
@CalledByNative |
- private static InvalidationService create( |
- Context context, long nativeInvalidationServiceAndroid) { |
+ private static InvalidationService create(long nativeInvalidationServiceAndroid) { |
ThreadUtils.assertOnUiThread(); |
- return new InvalidationService(context, nativeInvalidationServiceAndroid); |
+ return new InvalidationService(nativeInvalidationServiceAndroid); |
} |
/** |
@@ -73,8 +66,8 @@ public class InvalidationService { |
Account account = invalidationPreferences.getSavedSyncedAccount(); |
Intent registerIntent = InvalidationIntentProtocol.createRegisterIntent( |
account, objectSources, objectNames); |
- registerIntent.setClass( |
- mContext, InvalidationClientService.getRegisteredClass()); |
+ registerIntent.setClass(ContextUtils.getApplicationContext(), |
+ InvalidationClientService.getRegisteredClass()); |
startServiceIfPossible(registerIntent); |
} |
@@ -83,12 +76,12 @@ public class InvalidationService { |
// for O. See crbug.com/680812. |
if (BuildInfo.isAtLeastO()) { |
try { |
- mContext.startService(intent); |
+ ContextUtils.getApplicationContext().startService(intent); |
} catch (IllegalStateException exception) { |
Log.e(TAG, "Failed to start service from exception: ", exception); |
} |
} else { |
- mContext.startService(intent); |
+ ContextUtils.getApplicationContext().startService(intent); |
} |
} |