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

Unified Diff: chrome/android/junit/src/org/chromium/chrome/browser/offlinepages/ShadowGcmNetworkManager.java

Issue 2239003002: Revert of [Android] Update all Robolectric tests to Robolectric 3.0 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 4 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: chrome/android/junit/src/org/chromium/chrome/browser/offlinepages/ShadowGcmNetworkManager.java
diff --git a/chrome/android/junit/src/org/chromium/chrome/browser/offlinepages/ShadowGcmNetworkManager.java b/chrome/android/junit/src/org/chromium/chrome/browser/offlinepages/ShadowGcmNetworkManager.java
index 36271515b6367b031a55fa220a2bda2a57ed627e..b05e848597beddc6421f13a907447d9af6c90e58 100644
--- a/chrome/android/junit/src/org/chromium/chrome/browser/offlinepages/ShadowGcmNetworkManager.java
+++ b/chrome/android/junit/src/org/chromium/chrome/browser/offlinepages/ShadowGcmNetworkManager.java
@@ -18,34 +18,34 @@
*/
@Implements(GcmNetworkManager.class)
public class ShadowGcmNetworkManager {
- private Task mTask;
- private Task mCanceledTask;
+ private static Task sTask;
+ private static Task sCanceledTask;
@Implementation
- public void schedule(Task task) {
+ public static void schedule(Task task) {
// Capture the string part divisions so we can check them.
- mTask = task;
+ sTask = task;
}
@Implementation
- public void cancelTask(String tag, Class<? extends GcmTaskService> gcmTaskService) {
- if (mTask != null && mTask.getTag().equals(tag)
- && mTask.getServiceName().equals(gcmTaskService.getName())) {
- mCanceledTask = mTask;
- mTask = null;
+ public static void cancelTask(String tag, Class<? extends GcmTaskService> gcmTaskService) {
+ if (sTask != null && sTask.getTag().equals(tag)
+ && sTask.getServiceName().equals(gcmTaskService.getName())) {
+ sCanceledTask = sTask;
+ sTask = null;
}
}
- public Task getScheduledTask() {
- return mTask;
+ public static Task getScheduledTask() {
+ return sTask;
}
- public Task getCanceledTask() {
- return mCanceledTask;
+ public static Task getCanceledTask() {
+ return sCanceledTask;
}
- public void clear() {
- mTask = null;
- mCanceledTask = null;
+ public static void clear() {
+ sTask = null;
+ sCanceledTask = null;
}
}

Powered by Google App Engine
This is Rietveld 408576698