Allow update callback for existing CCT, rolls DEPS to the CL:1076648.

Bug: 847528
Change-Id: Ie119a50be4dc4131954cac001a70821feb94018f
Reviewed-on: https://chromium-review.googlesource.com/1077147
Commit-Queue: Anna Malova <amalova@chromium.org>
Reviewed-by: Benoit L <lizeb@chromium.org>
Reviewed-by: Bernhard Bauer <bauerb@chromium.org>
Reviewed-by: Peter Conn <peconn@chromium.org>
Cr-Commit-Position: refs/heads/master@{#588850}

DEPS

@@ -599,7 +599,7 @@ deps = {
   },
 
   'src/third_party/custom_tabs_client/src': {
-      'url': Var('chromium_git') + '/custom-tabs-client.git' + '@' + '81a14bc0885944a65afa81acd00da16cecb74b8b',
+      'url': Var('chromium_git') + '/custom-tabs-client.git' + '@' + '7ad890c969e7fcae8cd078c1f109f2aadd0793ee',
       'condition': 'checkout_android',
   },
 

chrome/android/java/src/org/chromium/chrome/browser/ChromeApplication.java

@@ -31,6 +31,7 @@ import org.chromium.build.BuildHooksAndroid;
 import org.chromium.build.BuildHooksConfig;
 import org.chromium.chrome.browser.crash.PureJavaExceptionHandler;
 import org.chromium.chrome.browser.crash.PureJavaExceptionReporter;
+import org.chromium.chrome.browser.customtabs.CustomTabsConnection;
 import org.chromium.chrome.browser.init.InvalidStartupDialog;
 import org.chromium.chrome.browser.metrics.UmaUtils;
 import org.chromium.chrome.browser.preferences.ChromePreferenceManager;
@@ -133,6 +134,8 @@ public class ChromeApplication extends Application {
         if ((level >= TRIM_MEMORY_RUNNING_LOW && level < TRIM_MEMORY_UI_HIDDEN)
                 || level >= TRIM_MEMORY_MODERATE) {
             if (mReferencePool != null) mReferencePool.drain();
+
+            CustomTabsConnection.cleanUpUnusedSessions();
         }
     }
 

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

@@ -162,6 +162,7 @@ class ClientManager {
     /** Per-session values. */
     private static class SessionParams {
         public final int uid;
+        private CustomTabsCallback mCustomTabsCallback;
         public final DisconnectCallback disconnectCallback;
         public final PostMessageHandler postMessageHandler;
         public final Set<Origin> mLinkedOrigins = new HashSet<>();
@@ -182,10 +183,11 @@ class ClientManager {
         private boolean mAllowResourcePrefetch;
         private boolean mShouldGetPageLoadMetrics;
 
-        public SessionParams(Context context, int uid, DisconnectCallback callback,
-                PostMessageHandler postMessageHandler) {
+        public SessionParams(Context context, int uid, CustomTabsCallback customTabsCallback,
+                             DisconnectCallback callback, PostMessageHandler postMessageHandler) {
             this.uid = uid;
             mPackageName = getPackageName(context, uid);
+            mCustomTabsCallback = customTabsCallback;
             disconnectCallback = callback;
             this.postMessageHandler = postMessageHandler;
             if (postMessageHandler != null) this.postMessageHandler.setPackageName(mPackageName);
@@ -253,6 +255,14 @@ class ClientManager {
         public boolean isDefault() {
             return !mIgnoreFragments && !mShouldSpeculateLoadOnCellular;
         }
+
+        public CustomTabsCallback getCustomTabsCallback() {
+            return mCustomTabsCallback;
+        }
+
+        public void setCustomTabsCallback(CustomTabsCallback customTabsCallback) {
+            mCustomTabsCallback = customTabsCallback;
+        }
     }
 
     private final Map<CustomTabsSessionToken, SessionParams> mSessionParams = new HashMap<>();
@@ -271,15 +281,17 @@ class ClientManager {
      * @param postMessageHandler The handler to be used for postMessage related operations.
      * @return true for success.
      */
-    public boolean newSession(CustomTabsSessionToken session, int uid,
+    public synchronized boolean newSession(CustomTabsSessionToken session, int uid,
             DisconnectCallback onDisconnect, @NonNull PostMessageHandler postMessageHandler) {
-        if (session == null) return false;
-        SessionParams params = new SessionParams(
-                ContextUtils.getApplicationContext(), uid, onDisconnect, postMessageHandler);
-        synchronized (this) {
-            if (mSessionParams.containsKey(session)) return false;
+        if (session == null || session.getCallback() == null) return false;
+        if (mSessionParams.containsKey(session)) {
+            mSessionParams.get(session).setCustomTabsCallback(session.getCallback());
+        } else {
+            SessionParams params = new SessionParams(ContextUtils.getApplicationContext(), uid,
+                    session.getCallback(), onDisconnect, postMessageHandler);
             mSessionParams.put(session, params);
         }
+
         return true;
     }
 
@@ -518,7 +530,10 @@ class ClientManager {
      * @return The callback {@link CustomTabsSessionToken} for the given session.
      */
     public synchronized CustomTabsCallback getCallbackForSession(CustomTabsSessionToken session) {
-        return session != null ? session.getCallback() : null;
+        if (session != null && mSessionParams.containsKey(session)) {
+            return mSessionParams.get(session).getCustomTabsCallback();
+        }
+        return null;
     }
 
     /**
@@ -748,6 +763,7 @@ class ClientManager {
      * Cleans up all data associated with all sessions.
      */
     public synchronized void cleanupAll() {
+        // cleanupSessionInternal modifies mSessionParams therefore we need a copy
         List<CustomTabsSessionToken> sessions = new ArrayList<>(mSessionParams.keySet());
         for (CustomTabsSessionToken session : sessions) cleanupSession(session);
     }
@@ -756,14 +772,44 @@ class ClientManager {
      * Handle any clean up left after a session is destroyed.
      * @param session The session that has been destroyed.
      */
-    public synchronized void cleanupSession(CustomTabsSessionToken session) {
+    private synchronized void cleanupSessionInternal(CustomTabsSessionToken session) {
         SessionParams params = mSessionParams.get(session);
         if (params == null) return;
         mSessionParams.remove(session);
-        if (params.postMessageHandler != null)
+        if (params.postMessageHandler != null) {
             params.postMessageHandler.cleanup(ContextUtils.getApplicationContext());
+        }
         if (params.originVerifier != null) params.originVerifier.cleanUp();
         if (params.disconnectCallback != null) params.disconnectCallback.run(session);
         mUidHasCalledWarmup.delete(params.uid);
     }
+
+    /**
+     * Destroys session when its callback become invalid if the callback is used as identifier.
+     *
+     * @param session The session with invalid callback.
+     */
+    public synchronized void cleanupSession(CustomTabsSessionToken session) {
+        if (session.hasId()) {
+            // Leave session parameters, so client might update callback later.
+            // The session will be completely removed when system runs low on memory.
+            // {@see #cleanupUnusedSessions}
+            mSessionParams.get(session).setCustomTabsCallback(null);
+        } else {
+            cleanupSessionInternal(session);
+        }
+    }
+
+    /**
+     * Clean up all sessions which are not currently used.
+     */
+    public synchronized void cleanupUnusedSessions() {
+        // cleanupSessionInternal modifies mSessionParams therefore we need a copy
+        List<CustomTabsSessionToken> sessions = new ArrayList<>(mSessionParams.keySet());
+        for (CustomTabsSessionToken session : sessions) {
+            if (mSessionParams.get(session).getCustomTabsCallback() == null) {
+                cleanupSessionInternal(session);
+            }
+        }
+    }
 }

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

@@ -185,8 +185,7 @@ public class CustomTabsConnection {
             new EnumeratedHistogramSample(
                     "CustomTabs.ParallelRequestStatusOnStart", ParallelRequestStatus.NUM_ENTRIES);
 
-    private static final CustomTabsConnection sInstance =
-            AppHooks.get().createCustomTabsConnection();
+    private static CustomTabsConnection sInstance;
     private @Nullable String mTrustedPublisherUrlPackage;
 
     /** Holds the parameters for the current hidden tab speculation. */
@@ -259,9 +258,17 @@ public class CustomTabsConnection {
      * @return The unique instance of ChromeCustomTabsConnection.
      */
     public static CustomTabsConnection getInstance() {
+        if (sInstance == null) {
+            sInstance = AppHooks.get().createCustomTabsConnection();
+        }
+
         return sInstance;
     }
 
+    private static boolean hasInstance() {
+        return sInstance != null;
+    }
+
     /**
      * If service requests logging is enabled, logs that a call was made.
      *
@@ -390,7 +397,7 @@ public class CustomTabsConnection {
      * @return Whether {@link CustomTabsConnection#warmup(long)} has been called.
      */
     public static boolean hasWarmUpBeenFinished() {
-        return sInstance.mWarmupHasBeenFinished.get();
+        return getInstance().mWarmupHasBeenFinished.get();
     }
 
     /**
@@ -1316,6 +1323,13 @@ public class CustomTabsConnection {
         ThreadUtils.runOnUiThread(() -> mClientManager.cleanupSession(session));
     }
 
+    /**
+     * Clean up unused sessions, i.e sessions without callback.
+     */
+    public static void cleanUpUnusedSessions() {
+        if (hasInstance()) getInstance().mClientManager.cleanupUnusedSessions();
+    }
+
     @VisibleForTesting
     int maySpeculateWithResult(CustomTabsSessionToken session) {
         if (!DeviceClassManager.enablePrerendering()) {