Consolidate/clarify TabLaunchTypes

chrome/android/javatests/src/org/chromium/chrome/browser/BindingManagerIntegrationTest.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;
 
 import android.content.Context;
 import android.os.Environment;
 import android.test.MoreAsserts;
 import android.test.suitebuilder.annotation.LargeTest;
@@ skipping 174 matching lines @@
     public void testTabSwitching() throws InterruptedException {
         // Create two tabs and wait until they are loaded, so that their renderers are around.
         final Tab[] tabs = new Tab[2];
         getInstrumentation().runOnMainSync(new Runnable() {
             @Override
             public void run() {
                 // Foreground tab.
                 TabCreator tabCreator = getActivity().getCurrentTabCreator();
                 tabs[0] = tabCreator.createNewTab(
                         new LoadUrlParams(mTestServer.getURL(FILE_PATH)),
-                                TabLaunchType.FROM_KEYBOARD, null);
+                                TabLaunchType.FROM_CHROME_UI, null);
                 // Background tab.
                 tabs[1] = tabCreator.createNewTab(
                         new LoadUrlParams(mTestServer.getURL(FILE_PATH)),
                                 TabLaunchType.FROM_LONGPRESS_BACKGROUND, null);
                 // On Svelte devices the background tab would not be loaded automatically, so
                 // trigger the load manually.
                 tabs[1].show(TabSelectionType.FROM_USER);
                 tabs[1].hide();
             }
         });
@@ skipping 50 matching lines @@
     public void testCrashInBackground() throws InterruptedException {
         // Create two tabs and wait until they are loaded, so that their renderers are around.
         final Tab[] tabs = new Tab[2];
         getInstrumentation().runOnMainSync(new Runnable() {
             @Override
             public void run() {
                 // Foreground tab.
                 TabCreator tabCreator = getActivity().getCurrentTabCreator();
                 tabs[0] = tabCreator.createNewTab(
                         new LoadUrlParams(mTestServer.getURL(FILE_PATH)),
-                                TabLaunchType.FROM_KEYBOARD, null);
+                                TabLaunchType.FROM_CHROME_UI, null);
                 // Background tab.
                 tabs[1] = tabCreator.createNewTab(
                         new LoadUrlParams(mTestServer.getURL(FILE_PATH)),
                                 TabLaunchType.FROM_LONGPRESS_BACKGROUND, null);
                 // On Svelte devices the background tab would not be loaded automatically, so
                 // trigger the load manually.
                 tabs[1].show(TabSelectionType.FROM_USER);
                 tabs[1].hide();
             }
         });
@@ skipping 84 matching lines @@
     @Feature({"ProcessManagement"})
     public void testCrashInForeground() throws InterruptedException {
         // Create a tab in foreground and wait until it is loaded.
         final Tab tab = ThreadUtils.runOnUiThreadBlockingNoException(
                 new Callable<Tab>() {
                     @Override
                     public Tab call() throws Exception {
                         TabCreator tabCreator = getActivity().getCurrentTabCreator();
                         return tabCreator.createNewTab(
                                 new LoadUrlParams(mTestServer.getURL(FILE_PATH)),
-                                        TabLaunchType.FROM_KEYBOARD, null);
+                                        TabLaunchType.FROM_CHROME_UI, null);
                     }
                 });
         ChromeTabUtils.waitForTabPageLoaded(tab, mTestServer.getURL(FILE_PATH));
         getInstrumentation().waitForIdleSync();
 
         // Kill the renderer and wait for the crash to be noted by the browser process.
         assertTrue(ChildProcessLauncher.crashProcessForTesting(
                 tab.getContentViewCore().getCurrentRenderProcessId()));
 
         CriteriaHelper.pollForCriteria(
@@ skipping 53 matching lines @@
     @Feature({"ProcessManagement"})
     public void testVisibilityDetermined() throws InterruptedException {
         // Create a tab in foreground and wait until it is loaded.
         final Tab fgTab = ThreadUtils.runOnUiThreadBlockingNoException(
                 new Callable<Tab>() {
                     @Override
                     public Tab call() {
                         TabCreator tabCreator = getActivity().getCurrentTabCreator();
                         return tabCreator.createNewTab(
                                 new LoadUrlParams(mTestServer.getURL(FILE_PATH)),
-                                        TabLaunchType.FROM_KEYBOARD, null);
+                                        TabLaunchType.FROM_CHROME_UI, null);
                     }});
         ChromeTabUtils.waitForTabPageLoaded(fgTab, mTestServer.getURL(FILE_PATH));
         int initialNavigationPid = getRenderProcessId(fgTab);
         // Ensure the following calls happened:
         //  - FG - setInForeground(true) - when the tab is created in the foreground
         //  - DETERMINED - visibilityDetermined() - after the initial navigation is committed
         assertEquals("FG;DETERMINED;", mBindingManager.getVisibilityCalls(initialNavigationPid));
 
         // Navigate to about:version which requires a different renderer.
         loadUrlInTab(ABOUT_VERSION_PATH, PageTransition.LINK, fgTab);
@@ skipping 41 matching lines @@
     @LargeTest
     @Feature({"ProcessManagement"})
     public void testReleaseAllModerateBindings() throws InterruptedException {
         final TabCreator tabCreator = getActivity().getCurrentTabCreator();
         final Tab[] tabs = new Tab[3];
         getInstrumentation().runOnMainSync(new Runnable() {
             @Override
             public void run() {
                 // Foreground tab.
                 tabs[0] = tabCreator.createNewTab(
-                        new LoadUrlParams("about:blank"), TabLaunchType.FROM_KEYBOARD, null);
+                        new LoadUrlParams("about:blank"), TabLaunchType.FROM_CHROME_UI, null);
                 // Background tab.
                 tabs[1] = tabCreator.createNewTab(
-                        new LoadUrlParams("about:blank"), TabLaunchType.FROM_KEYBOARD, null);
+                        new LoadUrlParams("about:blank"), TabLaunchType.FROM_CHROME_UI, null);
             }
         });
         ChromeTabUtils.waitForTabPageLoaded(tabs[0], "about:blank");
         ChromeTabUtils.waitForTabPageLoaded(tabs[1], "about:blank");
         // At this point 3 sanboxed services are allocated; the initial one + 2 new tabs.
         assertFalse(mBindingManager.isReleaseAllModerateBindingsCalled());
 
         getInstrumentation().runOnMainSync(new Runnable() {
             @Override
             public void run() {
                 // Foreground tab.
                 tabs[2] = tabCreator.createNewTab(
-                        new LoadUrlParams("about:blank"), TabLaunchType.FROM_KEYBOARD, null);
+                        new LoadUrlParams("about:blank"), TabLaunchType.FROM_CHROME_UI, null);
             }
         });
         ChromeTabUtils.waitForTabPageLoaded(tabs[2], "about:blank");
         // At this point all the sanboxed services are allocated.
         mBindingManager.assertIsReleaseAllModerateBindingsCalled();
     }
 
     @LargeTest
     @Feature({"ProcessManagement"})
     public void testRestoreSharedRenderer() throws Exception {
@@ skipping 95 matching lines @@
         super.tearDown();
     }
 
     /**
      * @return the index of the given tab in the current tab model
      */
     private int indexOf(Tab tab) {
         return getActivity().getCurrentTabModel().indexOf(tab);
     }
 }