Shortcut ctrl+shift+T added on android.

chrome/android/javatests/src/org/chromium/chrome/browser/multiwindow/MultiWindowUtilsTest.java

 // Copyright 2016 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.multiwindow;
 
 import android.annotation.TargetApi;
 import android.app.Activity;
 import android.content.Intent;
 import android.os.Build;
@@ skipping 26 matching lines @@
         startMainActivityOnBlankPage();
     }
 
     /**
      * Tests that ChromeTabbedActivity2 is used for intents when EXTRA_WINDOW_ID is set to 2.
      */
     @SmallTest
     @Feature("MultiWindow")
     public void testTabbedActivityForIntentWithExtraWindowId() throws InterruptedException {
         ChromeTabbedActivity activity1 = getActivity();
-        createSecondChromeTabbedActivity();
+        createSecondChromeTabbedActivity(activity1);
 
         Intent intent = activity1.getIntent();
         intent.putExtra(IntentHandler.EXTRA_WINDOW_ID, 2);
 
         assertEquals("ChromeTabbedActivity2 should be used when EXTRA_WINDOW_ID is set to 2.",
                 ChromeTabbedActivity2.class,
                 MultiWindowUtils.getInstance().getTabbedActivityForIntent(
                         intent, activity1));
     }
 
     /**
      * Tests that if two ChromeTabbedActivities are running the one that was resumed most recently
      * is used as the class name for new intents.
      */
     @SmallTest
     @Feature("MultiWindow")
     public void testTabbedActivityForIntentLastResumedActivity() throws InterruptedException {
         ChromeTabbedActivity activity1 = getActivity();
-        final ChromeTabbedActivity2 activity2 = createSecondChromeTabbedActivity();
+        final ChromeTabbedActivity2 activity2 = createSecondChromeTabbedActivity(activity1);
 
         assertFalse("ChromeTabbedActivity should not be resumed",
                 ApplicationStatus.getStateForActivity(activity1) == ActivityState.RESUMED);
         assertTrue("ChromeTabbedActivity2 should be resumed",
                 ApplicationStatus.getStateForActivity(activity2) == ActivityState.RESUMED);
 
         // Open settings and wait for ChromeTabbedActivity2 to pause.
         activity2.onMenuOrKeyboardAction(R.id.preferences_id, true);
         int expected = ActivityState.PAUSED;
         CriteriaHelper.pollUiThread(Criteria.equals(expected, new Callable<Integer>() {
@@ skipping 11 matching lines @@
 
     /**
      * Tests that if only ChromeTabbedActivity is running it is used as the class name for intents.
      */
     @SmallTest
     @Feature("MultiWindow")
     @TargetApi(Build.VERSION_CODES.LOLLIPOP)
     public void testTabbedActivityForIntentOnlyActivity1IsRunning()
             throws InterruptedException {
         ChromeTabbedActivity activity1 = getActivity();
-        ChromeTabbedActivity2 activity2 = createSecondChromeTabbedActivity();
+        ChromeTabbedActivity2 activity2 = createSecondChromeTabbedActivity(activity1);
         activity2.finishAndRemoveTask();
 
         assertEquals("ChromeTabbedActivity should be used for intents if ChromeTabbedActivity2 is "
                 + "not running.",
                 ChromeTabbedActivity.class,
                 MultiWindowUtils.getInstance().getTabbedActivityForIntent(
                         activity1.getIntent(), activity1));
     }
 
     /**
      * Tests that if only ChromeTabbedActivity2 is running it is used as the class name for intents.
      */
     @SmallTest
     @Feature("MultiWindow")
     @TargetApi(Build.VERSION_CODES.LOLLIPOP)
     public void testTabbedActivityForIntentOnlyActivity2IsRunning()
             throws InterruptedException {
         ChromeTabbedActivity activity1 = getActivity();
-        createSecondChromeTabbedActivity();
+        createSecondChromeTabbedActivity(activity1);
         activity1.finishAndRemoveTask();
 
         assertEquals("ChromeTabbedActivity2 should be used for intents if ChromeTabbedActivity is "
                 + "not running.",
                 ChromeTabbedActivity2.class,
                 MultiWindowUtils.getInstance().getTabbedActivityForIntent(
                         activity1.getIntent(), activity1));
     }
 
     /**
@@ skipping 13 matching lines @@
                         activity1.getIntent(), activity1));
     }
 
     /**
      * Tests that MultiWindowUtils properly tracks whether ChromeTabbedActivity2 is running.
      */
     @SmallTest
     @Feature("MultiWindow")
     @TargetApi(Build.VERSION_CODES.LOLLIPOP)
     public void testTabbedActivity2TaskRunning() throws InterruptedException {
-        ChromeTabbedActivity activity2 = createSecondChromeTabbedActivity();
+        ChromeTabbedActivity activity2 = createSecondChromeTabbedActivity(getActivity());
         assertTrue(MultiWindowUtils.getInstance().getTabbedActivity2TaskRunning());
 
         activity2.finishAndRemoveTask();
         MultiWindowUtils.getInstance().getTabbedActivityForIntent(
                 getActivity().getIntent(), getActivity());
         assertFalse(MultiWindowUtils.getInstance().getTabbedActivity2TaskRunning());
     }
 
-    private ChromeTabbedActivity2 createSecondChromeTabbedActivity() throws InterruptedException {
+    public static ChromeTabbedActivity2 createSecondChromeTabbedActivity(Activity activity)
+            throws InterruptedException {
         // TODO(twellington): after there is test support for putting an activity into multi-window
         // mode, this should be changed to use the menu item for opening a new window.
 
         // Number of expected activities after the second ChromeTabbedActivity is created.
         int numExpectedActivities = ApplicationStatus.getRunningActivities().size() + 1;
 
         // Get the class name to use for the second ChromeTabbedActivity. This step is important
         // for initializing things in MultiWindowUtils.java.
-        ChromeTabbedActivity activity = getActivity();
         Class<? extends Activity> secondActivityClass =
                 MultiWindowUtils.getInstance().getOpenInOtherWindowActivity(activity);
         assertEquals("ChromeTabbedActivity2 should be used as the 'open in other window' activity.",
                 ChromeTabbedActivity2.class, secondActivityClass);
 
         // Create an intent and start the second ChromeTabbedActivity.
         Intent intent = new Intent(activity.getIntent());
         intent.setClass(activity, secondActivityClass);
         activity.startActivity(intent);
 
@@ skipping 11 matching lines @@
             Activity runningActivity = reference.get();
             if (runningActivity == null) continue;
             if (runningActivity.getClass().equals(ChromeTabbedActivity2.class)) {
                 returnActivity = (ChromeTabbedActivity2) runningActivity;
             }
         }
         assertTrue(returnActivity != null);
         return returnActivity;
     }
 }