🛃 Move Client Data header out of ClientManager.

Bug: 1040143
Change-Id: Ife79cfe1f0c5963bf4c6c7bee0c810e936b0a9a0
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2062208
Commit-Queue: Peter Conn <peconn@chromium.org>
Reviewed-by: Michael van Ouwerkerk <mvanouwerkerk@chromium.org>
Cr-Commit-Position: refs/heads/master@{#743100}

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

@@ -188,7 +188,6 @@ class ClientManager {
         private boolean mAllowResourcePrefetch;
         private boolean mShouldGetPageLoadMetrics;
         private boolean mShouldHideTopBar;
-        private String mCustomTabsClientDataHeaderValue;
 
         public SessionParams(Context context, int uid, CustomTabsCallback customTabsCallback,
                 DisconnectCallback callback, PostMessageHandler postMessageHandler,
@@ -583,25 +582,6 @@ class ClientManager {
         if (params != null) params.mShouldSendBottomBarScrollState = send;
     }
 
-    /**
-     * Sets the value of the X-CCT-Client-Data header that will be sent on some Custom Tabs
-     * requests.
-     */
-    public synchronized void setClientDataHeaderValue(
-            CustomTabsSessionToken session, String headerValue) {
-        SessionParams params = mSessionParams.get(session);
-        if (params != null) params.mCustomTabsClientDataHeaderValue = headerValue;
-    }
-
-    /**
-     * Gets the value previously set by {@link #setClientDataHeaderValue}.
-     */
-    public synchronized String getClientDataHeaderValue(CustomTabsSessionToken session) {
-        SessionParams params = mSessionParams.get(session);
-        if (params == null) return null;
-        return params.mCustomTabsClientDataHeaderValue;
-    }
-
     /**
      * @return Whether navigation info should be recorded and shared for the session.
      */
@@ -738,6 +718,14 @@ class ClientManager {
         return params != null ? params.mShouldGetPageLoadMetrics : false;
     }
 
+    /**
+     * Returns the uid associated with the session, {@code -1} if there is no matching session.
+     */
+    public synchronized int getUidForSession(CustomTabsSessionToken session) {
+        SessionParams params = mSessionParams.get(session);
+        return params != null ? params.uid : -1;
+    }
+
     /**
      * Returns whether an origin is first-party with respect to a session, that is if the
      * application linked to the session has a relation with the provided origin. This does not

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

@@ -818,11 +818,12 @@ public class CustomTabsConnection {
      * @param webContents the WebContents of the new tab.
      */
     public void setClientDataHeaderForNewTab(
-            CustomTabsSessionToken session, WebContents webContents) {
-        String header = getClientDataHeaderValueForSession(session);
-        if (!TextUtils.isEmpty(header)) {
-            CustomTabsConnectionJni.get().setClientDataHeader(webContents, header);
-        }
+            CustomTabsSessionToken session, WebContents webContents) {}
+
+    protected void setClientDataHeader(WebContents webContents, String header) {
+        if (TextUtils.isEmpty(header)) return;
+
+        CustomTabsConnectionJni.get().setClientDataHeader(webContents, header);
     }
 
     private void maybePreconnectToRedirectEndpoint(
@@ -1043,13 +1044,6 @@ public class CustomTabsConnection {
         mClientManager.setSendNavigationInfoForSession(session, send);
     }
 
-    /**
-     * See {@link ClientManager#setClientDataHeaderValue}.
-     */
-    String getClientDataHeaderValueForSession(CustomTabsSessionToken session) {
-        return mClientManager.getClientDataHeaderValue(session);
-    }
-
     /**
      * Extracts the creator package name from the intent.
      * @param intent The intent to get the package name from.

chrome/android/javatests/src/org/chromium/chrome/browser/customtabs/ClientManagerTest.java

@@ -170,20 +170,6 @@ public class ClientManagerTest {
                 mClientManager.getPredictionOutcome(mSession, URL + "#fragment"));
     }
 
-    @Test
-    @SmallTest
-    public void testClientDataHeader() {
-        Assert.assertTrue(mClientManager.newSession(mSession, mUid, null, null, null));
-
-        String headerValue = "header value";
-
-        mClientManager.setClientDataHeaderValue(mSession, headerValue);
-        Assert.assertEquals(headerValue, mClientManager.getClientDataHeaderValue(mSession));
-
-        mClientManager.setClientDataHeaderValue(mSession, null);
-        Assert.assertNull(mClientManager.getClientDataHeaderValue(mSession));
-    }
-
     @Test
     @SmallTest
     public void testPostMessageOriginVerification() {