chrome/android: Enable gcm upstream by default for invalidations.

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

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 aeb831398042dd140b2ad0ff700ca0162b6ca180..1094612138b35d5583b110f12b347dc442259251 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
@@ -159,11 +159,6 @@ public class InvalidationController implements ApplicationStatus.ApplicationStat
     private int mNumRecentTabPages;
 
     /**
-     * Whether GCM Upstream should be used for sending upstream messages.
-     */
-    private boolean mUseGcmUpstream;
-
-    /**
      * Whether GCM has been initialized for Invalidations.
      */
     private boolean mGcmInitialized;
@@ -210,7 +205,8 @@ public class InvalidationController implements ApplicationStatus.ApplicationStat
         new AsyncTask<Void, Void, Void>() {
             @Override
             protected Void doInBackground(Void... arg0) {
-                AndroidGcmController.get(mContext).initializeGcm(mUseGcmUpstream);
+                boolean useGcmUpstream = true;
+                AndroidGcmController.get(mContext).initializeGcm(useGcmUpstream);
                 return null;
             }
         }.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
@@ -309,10 +305,7 @@ public class InvalidationController implements ApplicationStatus.ApplicationStat
                 boolean canDisableSessionInvalidations = !requireInvalidationsForInstrumentation
                         && !requireInvalidationsForSuggestions;
 
-                boolean canUseGcmUpstream =
-                        FieldTrialList.findFullName("InvalidationsGCMUpstream").equals("Enabled");
-                sInstance = new InvalidationController(
-                        context, canDisableSessionInvalidations, canUseGcmUpstream);
+                sInstance = new InvalidationController(context, canDisableSessionInvalidations);
             }
             return sInstance;
         }
@@ -344,12 +337,10 @@ public class InvalidationController implements ApplicationStatus.ApplicationStat
      * Creates an instance using {@code context} to send intents.
      */
     @VisibleForTesting
-    InvalidationController(
-            Context context, boolean canDisableSessionInvalidations, boolean canUseGcmUpstream) {
+    InvalidationController(Context context, boolean canDisableSessionInvalidations) {
         Context appContext = context.getApplicationContext();
         if (appContext == null) throw new NullPointerException("Unable to get application context");
         mContext = appContext;
-        mUseGcmUpstream = canUseGcmUpstream;
         mCanDisableSessionInvalidations = canDisableSessionInvalidations;
         mSessionInvalidationsEnabled = !mCanDisableSessionInvalidations;
         mEnableSessionInvalidationsTimer = new Timer();