| Index: chrome/android/javatests/src/org/chromium/chrome/browser/BindingManagerInDocumentModeIntegrationTest.java
|
| diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/BindingManagerInDocumentModeIntegrationTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/BindingManagerInDocumentModeIntegrationTest.java
|
| index 50ddf73c05d50d04b3ce04b54d1b398422194134..8d7bb3625ad28880d5ace9da9ee7e831632dd6c7 100644
|
| --- a/chrome/android/javatests/src/org/chromium/chrome/browser/BindingManagerInDocumentModeIntegrationTest.java
|
| +++ b/chrome/android/javatests/src/org/chromium/chrome/browser/BindingManagerInDocumentModeIntegrationTest.java
|
| @@ -4,13 +4,18 @@
|
|
|
| package org.chromium.chrome.browser;
|
|
|
| +import static org.chromium.base.test.util.Restriction.RESTRICTION_TYPE_NON_LOW_END_DEVICE;
|
| +
|
| import android.content.Context;
|
| import android.os.Build;
|
| +import android.test.suitebuilder.annotation.LargeTest;
|
| import android.util.SparseArray;
|
| import android.util.SparseBooleanArray;
|
|
|
| -import org.chromium.base.test.util.DisabledTest;
|
| +import org.chromium.base.test.util.CommandLineFlags;
|
| +import org.chromium.base.test.util.Feature;
|
| import org.chromium.base.test.util.MinAndroidSdkLevel;
|
| +import org.chromium.base.test.util.Restriction;
|
| import org.chromium.chrome.browser.document.DocumentModeTestBase;
|
| import org.chromium.chrome.browser.tab.Tab;
|
| import org.chromium.chrome.browser.tabmodel.document.DocumentTabModelSelector;
|
| @@ -157,10 +162,9 @@ public class BindingManagerInDocumentModeIntegrationTest extends DocumentModeTes
|
| * Verifies that the .setProcessInForeground() signal is called correctly as the tabs are
|
| * created and switched.
|
| */
|
| - // @Restriction(RESTRICTION_TYPE_NON_LOW_END_DEVICE)
|
| - // @LargeTest
|
| - // @Feature({"ProcessManagement"})
|
| - @DisabledTest // https://crbug.com/592404
|
| + @Restriction(RESTRICTION_TYPE_NON_LOW_END_DEVICE)
|
| + @LargeTest
|
| + @Feature({"ProcessManagement"})
|
| public void testTabSwitching() throws Exception {
|
| // Create two tabs and wait until they are loaded, so that their renderers are around.
|
| final Tab[] tabs = new Tab[2];
|
| @@ -202,9 +206,8 @@ public class BindingManagerInDocumentModeIntegrationTest extends DocumentModeTes
|
| * Verifies that a renderer that crashes in foreground has the correct visibility when
|
| * recreated.
|
| */
|
| - // @LargeTest
|
| - // @Feature({"ProcessManagement"})
|
| - @DisabledTest // https://crbug.com/592404
|
| + @LargeTest
|
| + @Feature({"ProcessManagement"})
|
| public void testCrashInForeground() throws Exception {
|
| // Create a tab in foreground and wait until it is loaded.
|
| final Tab tab = ChromeApplication.getDocumentTabModelSelector().getTabById(
|
| @@ -257,10 +260,9 @@ public class BindingManagerInDocumentModeIntegrationTest extends DocumentModeTes
|
| * Ensures correctness of the visibilityDetermined() calls, that should be always preceded by
|
| * setInForeground().
|
| */
|
| - // @Restriction(RESTRICTION_TYPE_NON_LOW_END_DEVICE)
|
| - // @LargeTest
|
| - // @Feature({"ProcessManagement"})
|
| - @DisabledTest // https://crbug.com/592404
|
| + @Restriction(RESTRICTION_TYPE_NON_LOW_END_DEVICE)
|
| + @LargeTest
|
| + @Feature({"ProcessManagement"})
|
| public void testVisibilityDetermined() throws Exception {
|
| // Create a tab in foreground and wait until it is loaded.
|
| final Tab fgTab = ChromeApplication.getDocumentTabModelSelector().getTabById(
|
| @@ -306,10 +308,9 @@ public class BindingManagerInDocumentModeIntegrationTest extends DocumentModeTes
|
| * Verifies that BindingManager.releaseAllModerateBindings() is called once all the sandboxed
|
| * services are allocated.
|
| */
|
| - // @CommandLineFlags.Add(ChildProcessLauncher.SWITCH_NUM_SANDBOXED_SERVICES_FOR_TESTING + "=4")
|
| - // @LargeTest
|
| - // @Feature({"ProcessManagement"})
|
| - @DisabledTest // https://crbug.com/592404
|
| + @CommandLineFlags.Add(ChildProcessLauncher.SWITCH_NUM_SANDBOXED_SERVICES_FOR_TESTING + "=4")
|
| + @LargeTest
|
| + @Feature({"ProcessManagement"})
|
| public void testReleaseAllModerateBindings() throws Exception {
|
| launchViaViewIntent(false, URL_1, "Page 1");
|
| launchViaViewIntent(false, URL_1, "Page 1");
|
|
|