Kick incognito tabs from CCTs to tabbed mode.

chrome/android/javatests/src/org/chromium/chrome/browser/customtabs/CustomTabActivityTest.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 static org.chromium.base.test.util.Restriction.RESTRICTION_TYPE_NON_LOW_END_DEVICE;
 
 import android.app.Activity;
 import android.app.Application;
@@ skipping 14 matching lines @@
 import android.os.Build;
 import android.os.Bundle;
 import android.os.SystemClock;
 import android.support.customtabs.CustomTabsCallback;
 import android.support.customtabs.CustomTabsClient;
 import android.support.customtabs.CustomTabsIntent;
 import android.support.customtabs.CustomTabsService;
 import android.support.customtabs.CustomTabsServiceConnection;
 import android.support.customtabs.CustomTabsSession;
 import android.support.customtabs.CustomTabsSessionToken;
+import android.support.test.filters.MediumTest;
 import android.support.test.filters.SmallTest;
 import android.text.TextUtils;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.EditText;
 import android.widget.ImageButton;
 
+import org.chromium.base.ActivityState;
+import org.chromium.base.ApplicationStatus;
+import org.chromium.base.ApplicationStatus.ActivityStateListener;
 import org.chromium.base.ObserverList.RewindableIterator;
 import org.chromium.base.PathUtils;
 import org.chromium.base.ThreadUtils;
 import org.chromium.base.library_loader.LibraryLoader;
 import org.chromium.base.library_loader.LibraryProcessType;
 import org.chromium.base.test.util.CallbackHelper;
 import org.chromium.base.test.util.CommandLineFlags;
 import org.chromium.base.test.util.DisabledTest;
 import org.chromium.base.test.util.Restriction;
 import org.chromium.base.test.util.RetryOnFailure;
@@ skipping 25 matching lines @@
 import org.chromium.content.browser.BrowserStartupController;
 import org.chromium.content.browser.BrowserStartupController.StartupCallback;
 import org.chromium.content.browser.test.util.Criteria;
 import org.chromium.content.browser.test.util.CriteriaHelper;
 import org.chromium.content.browser.test.util.DOMUtils;
 import org.chromium.content.browser.test.util.JavaScriptUtils;
 import org.chromium.content_public.browser.LoadUrlParams;
 import org.chromium.content_public.browser.WebContentsObserver;
 import org.chromium.net.test.EmbeddedTestServer;
 import org.chromium.net.test.util.TestWebServer;
+import org.chromium.ui.mojom.WindowOpenDisposition;
 
 import java.util.ArrayList;
 import java.util.concurrent.Callable;
 import java.util.concurrent.TimeoutException;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicReference;
 
 /**
  * Instrumentation tests for app menu, context menu, and toolbar of a {@link CustomTabActivity}.
  */
@@ skipping 1760 matching lines @@
     public void testClientCanSetReferrer() throws Exception {
         String referrerUrl = "android-app://com.foo.me/";
         maybePrerenderAndLaunchWithReferrers(mTestPage, false, null, referrerUrl);
 
         Tab tab = mActivity.getActivityTab();
         // The Referrer is correctly set.
         CriteriaHelper.pollInstrumentationThread(
                 new TabsOpenedFromExternalAppTest.ReferrerCriteria(tab, referrerUrl), 2000, 200);
     }
 
+    @MediumTest
+    public void testLaunchIncognitoURL() throws Exception {
+        Intent intent = createMinimalCustomTabIntent();
+        startCustomTabActivityWithIntent(intent);
+
+        final CustomTabActivity cctActivity = getActivity();
+        final CallbackHelper mCctHiddenCallback = new CallbackHelper();
+        final CallbackHelper mTabbedModeShownCallback = new CallbackHelper();
+        final AtomicReference<ChromeTabbedActivity> tabbedActivity = new AtomicReference<>();
+
+        ActivityStateListener listener = new ActivityStateListener() {
+            @Override
+            public void onActivityStateChange(Activity activity, int newState) {
+                if (activity == cctActivity
+                        && (newState == ActivityState.STOPPED
+                                   || newState == ActivityState.DESTROYED)) {
+                    mCctHiddenCallback.notifyCalled();
+                }
+
+                if (activity instanceof ChromeTabbedActivity && newState == ActivityState.RESUMED) {
+                    mTabbedModeShownCallback.notifyCalled();
+                    tabbedActivity.set((ChromeTabbedActivity) activity);
+                }
+            }
+        };
+        ApplicationStatus.registerStateListenerForAllActivities(listener);
+
+        ThreadUtils.runOnUiThread(new Runnable() {
+            @Override
+            public void run() {
+                cctActivity.getActivityTab().getTabWebContentsDelegateAndroid().openNewTab(
+                        "about:blank", null, null, WindowOpenDisposition.OFF_THE_RECORD, false);
+            }
+        });
+
+        mCctHiddenCallback.waitForCallback("CCT not hidden.", 0);
+        mTabbedModeShownCallback.waitForCallback("Tabbed mode not shown.", 0);
+
+        CriteriaHelper.pollUiThread(Criteria.equals(true, new Callable<Boolean>() {
+            @Override
+            public Boolean call() throws Exception {
+                return tabbedActivity.get().areTabModelsInitialized();
+            }
+        }));
+
+        CriteriaHelper.pollUiThread(new Criteria() {
+            @Override
+            public boolean isSatisfied() {
+                Tab tab = tabbedActivity.get().getActivityTab();
+                if (tab == null) {
+                    updateFailureReason("Tab is null");
+                    return false;
+                }
+                if (!tab.isIncognito()) {
+                    updateFailureReason("Incognito tab not selected");
+                    return false;
+                }
+                if (!TextUtils.equals(tab.getUrl(), "about:blank")) {
+                    updateFailureReason("Wrong URL loaded in incognito tab");
+                    return false;
+                }
+                return true;
+            }
+        });
+
+        ApplicationStatus.unregisterActivityStateListener(listener);
+    }
+
     /**
      * Tests that a Weblite URL from an external app uses the lite_url param when Data Reduction
      * Proxy previews are being used.
      */
     @SmallTest
     @CommandLineFlags.Add({"enable-spdy-proxy-auth", "data-reduction-proxy-lo-fi=always-on",
             "enable-data-reduction-proxy-lite-page"})
     @RetryOnFailure
     public void testLaunchWebLiteURL() throws Exception {
         final String testUrl = WEBLITE_PREFIX + mTestPage;
@@ skipping 325 matching lines @@
                 if (jsonText.equalsIgnoreCase("null")) jsonText = "";
                 value = jsonText;
             } catch (InterruptedException | TimeoutException e) {
                 e.printStackTrace();
                 return false;
             }
             return TextUtils.equals(mExpected, value);
         }
     }
 }