Don't require FRE for connecting to custom tabs service

chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabsConnectionService.java

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 package org.chromium.chrome.browser.customtabs;
 
 import android.content.Intent;
 import android.net.Uri;
 import android.os.Bundle;
 import android.os.IBinder;
 import android.support.customtabs.CustomTabsService;
 import android.support.customtabs.CustomTabsSessionToken;
 
 import org.chromium.chrome.browser.firstrun.FirstRunFlowSequencer;
 
 import java.util.List;
 
 /**
  * Custom tabs connection service, used by the embedded Chrome activities.
  */
 public class CustomTabsConnectionService extends CustomTabsService {
     private CustomTabsConnection mConnection;
+    private Intent mBindIntent;
 
     @Override
     public IBinder onBind(Intent intent) {
-        boolean firstRunNecessary = FirstRunFlowSequencer
-                .checkIfFirstRunIsNecessary(getApplicationContext(), intent) != null;
-        if (firstRunNecessary) return null;
+        mBindIntent = intent;
         mConnection = CustomTabsConnection.getInstance(getApplication());
         mConnection.logCall("Service#onBind()", true);
         return super.onBind(intent);
     }
 
     @Override
     public boolean onUnbind(Intent intent) {
         super.onUnbind(intent);
         if (mConnection != null) mConnection.logCall("Service#onUnbind()", true);
         return false; // No support for onRebind().
     }
 
     @Override
     protected boolean warmup(long flags) {
+        if (!isFirstRunDone()) return false;
         return mConnection.warmup(flags);
     }
 
     @Override
     protected boolean newSession(CustomTabsSessionToken sessionToken) {
         return mConnection.newSession(sessionToken);
     }
 
     @Override
     protected boolean mayLaunchUrl(CustomTabsSessionToken sessionToken, Uri url, Bundle extras,
             List<Bundle> otherLikelyBundles) {
+        if (!isFirstRunDone()) return false;
         return mConnection.mayLaunchUrl(sessionToken, url, extras, otherLikelyBundles);
     }
 
     @Override
     protected Bundle extraCommand(String commandName, Bundle args) {
         return mConnection.extraCommand(commandName, args);
     }
 
     @Override
     protected boolean updateVisuals(CustomTabsSessionToken sessionToken, Bundle bundle) {
+        if (!isFirstRunDone()) return false;
         return mConnection.updateVisuals(sessionToken, bundle);
     }
 
     @Override
     protected boolean cleanUpSession(CustomTabsSessionToken sessionToken) {
         mConnection.cleanUpSession(sessionToken);
         return super.cleanUpSession(sessionToken);
     }
+
+    private boolean isFirstRunDone() {
+        if (mBindIntent == null) return true;
+        boolean firstRunNecessary = FirstRunFlowSequencer
+                .checkIfFirstRunIsNecessary(getApplicationContext(), mBindIntent) != null;
+        if (!firstRunNecessary) {
+            mBindIntent = null;
+            return true;
+        }
+        return false;
+    }
 }