| 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 13cf98423b5bbca1025de4d7775efdff1ef290e0..6564edae513819804453a05edfac2c3438b2e159 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
|
| @@ -277,15 +277,10 @@ public class InvalidationController implements ApplicationStatus.ApplicationStat
|
| synchronized (LOCK) {
|
| if (sInstance == null) {
|
| // The PageRevisitInstrumentation trial needs sessions invalidations to be on such
|
| - // that local session data is current and can be used to perform checks. Its
|
| - // preference should override the AndroidSessionNotifications trial.
|
| + // that local session data is current and can be used to perform checks.
|
| boolean requireInvalidationsForInstrumentation =
|
| FieldTrialList.findFullName("PageRevisitInstrumentation").equals("Enabled");
|
| - boolean tryToDisableInvalidationsAsOptimization =
|
| - FieldTrialList.findFullName("AndroidSessionNotifications")
|
| - .equals("Disabled");
|
| - boolean canDisableSessionInvalidations = !requireInvalidationsForInstrumentation
|
| - && tryToDisableInvalidationsAsOptimization;
|
| + boolean canDisableSessionInvalidations = !requireInvalidationsForInstrumentation;
|
|
|
| boolean canUseGcmUpstream =
|
| FieldTrialList.findFullName("InvalidationsGCMUpstream").equals("Enabled");
|
|
|