customtabs: Always call CustomTabsConnection.onHandledIntent().

Previously, only new intents going to the current active session would go
through CustomTabsConnection.onHandledIntent(), which is not the
intended behavior, as this is used to trigger preconnection to redirect
endpoints.

[email protected]

(cherry picked from commit 67e17f3)

Bug: 739165
Change-Id: Ie9da5dcf4e25f4d0ca2044cba20956a316f7a253
Reviewed-on: https://chromium-review.googlesource.com/581110
Commit-Queue: Benoit L <[email protected]>
Reviewed-by: Yusuf Ozuysal <[email protected]>
Cr-Original-Commit-Position: refs/heads/master@{#488952}
Reviewed-on: https://chromium-review.googlesource.com/586551
Reviewed-by: Benoit L <[email protected]>
Cr-Commit-Position: refs/branch-heads/3163@{#55}
Cr-Branched-From: ff259ba-refs/heads/master@{#488528}

Author: Benoit Lize

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

@@ -225,24 +225,26 @@ public static void setActiveContentHandler(CustomTabContentHandler contentHandle
     }
 
     /**
-     * Used to check whether an incoming intent can be handled by the
-     * current {@link CustomTabContentHandler}.
+     * Called when a CustomTabs intent is handled.
+     *
+     * Used to check whether an incoming intent can be handled by the current
+     * {@link CustomTabContentHandler}, and to perform action on new Intent.
+     *
      * @return Whether the active {@link CustomTabContentHandler} has handled the intent.
      */
     public static boolean handleInActiveContentIfNeeded(Intent intent) {
-        if (sActiveContentHandler == null) return false;
-
-        if (sActiveContentHandler.shouldIgnoreIntent(intent)) {
-            Log.w(TAG, "Incoming intent to Custom Tab was ignored.");
-            return false;
-        }
-
         CustomTabsSessionToken session = CustomTabsSessionToken.getSessionTokenFromIntent(intent);
-        if (session == null || !session.equals(sActiveContentHandler.getSession())) return false;
 
         String url = IntentHandler.getUrlFromIntent(intent);
         if (TextUtils.isEmpty(url)) return false;
         CustomTabsConnection.getInstance().onHandledIntent(session, url, intent);
+
+        if (sActiveContentHandler == null) return false;
+        if (session == null || !session.equals(sActiveContentHandler.getSession())) return false;
+        if (sActiveContentHandler.shouldIgnoreIntent(intent)) {
+            Log.w(TAG, "Incoming intent to Custom Tab was ignored.");
+            return false;
+        }
         sActiveContentHandler.loadUrlAndTrackFromTimestamp(new LoadUrlParams(url),
                 IntentHandler.getTimestampFromIntent(intent));
         return true;