Audit Profile usage in RequestCoordinatorBridgeTest

Bug: 1060940
Change-Id: I523009ba4a6d9ad6d257b9b2bc0e6b3061b379cb
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2494724Reviewed-by: Marc Treib <treib@chromium.org>
Commit-Queue: Rohit Agarwal <roagarwal@chromium.org>
Cr-Commit-Position: refs/heads/master@{#820276}

chrome/android/javatests/src/org/chromium/chrome/browser/offlinepages/RequestCoordinatorBridgeTest.java

@@ -16,6 +16,7 @@ import org.chromium.base.Callback;
 import org.chromium.base.task.PostTask;
 import org.chromium.base.test.util.CommandLineFlags;
 import org.chromium.chrome.browser.flags.ChromeSwitches;
+import org.chromium.chrome.browser.profiles.OTRProfileID;
 import org.chromium.chrome.browser.profiles.Profile;
 import org.chromium.chrome.test.ChromeJUnit4ClassRunner;
 import org.chromium.chrome.test.ChromeTabbedActivityTestRule;
@@ -41,16 +42,12 @@ public class RequestCoordinatorBridgeTest {
     private static final int TIMEOUT_MS = 5000;
 
     private RequestCoordinatorBridge mRequestCoordinatorBridge;
+    private Profile mProfile;
 
-    private void initializeBridgeForProfile(final boolean incognitoProfile)
-            throws InterruptedException {
+    private void initializeBridgeForProfile() throws InterruptedException {
         final Semaphore semaphore = new Semaphore(0);
         PostTask.runOrPostTask(UiThreadTaskTraits.DEFAULT, () -> {
-            Profile profile = Profile.getLastUsedRegularProfile();
-            if (incognitoProfile) {
-                profile = profile.getOffTheRecordProfile();
-            }
-            mRequestCoordinatorBridge = RequestCoordinatorBridge.getForProfile(profile);
+            mRequestCoordinatorBridge = RequestCoordinatorBridge.getForProfile(mProfile);
             semaphore.release();
         });
         Assert.assertTrue(semaphore.tryAcquire(TIMEOUT_MS, TimeUnit.MILLISECONDS));
@@ -68,7 +65,10 @@ public class RequestCoordinatorBridgeTest {
             }
         });
 
-        initializeBridgeForProfile(false);
+        TestThreadUtils.runOnUiThreadBlocking(
+                () -> { mProfile = Profile.getLastUsedRegularProfile(); });
+
+        initializeBridgeForProfile();
     }
 
     @Test
@@ -106,8 +106,21 @@ public class RequestCoordinatorBridgeTest {
 
     @Test
     @MediumTest
-    public void testRequestCoordinatorBridgeDisabledInIncognito() throws Exception {
-        initializeBridgeForProfile(true);
+    public void testRequestCoordinatorBridgeDisabledInIncognitoTabbedActivity() throws Exception {
+        TestThreadUtils.runOnUiThreadBlocking(
+                () -> { mProfile = Profile.getLastUsedRegularProfile().getPrimaryOTRProfile(); });
+        initializeBridgeForProfile();
+        Assert.assertEquals(null, mRequestCoordinatorBridge);
+    }
+
+    @Test
+    @MediumTest
+    public void testRequestCoordinatorBridgeDisabledInIncognitoCCT() throws Exception {
+        OTRProfileID otrProfileID = OTRProfileID.createUnique("CCT:Incognito");
+        TestThreadUtils.runOnUiThreadBlocking(() -> {
+            mProfile = Profile.getLastUsedRegularProfile().getOffTheRecordProfile(otrProfileID);
+        });
+        initializeBridgeForProfile();
         Assert.assertEquals(null, mRequestCoordinatorBridge);
     }