Commit 15e5e1b2 authored by Theresa Wellington's avatar Theresa Wellington Committed by Commit Bot

Reenable TabModelMergingTest on Pie

Add FLAG_ACTIVITY_NEW_TASK to intents used to launch new
activities in TabModelMergintTest, and reenable
 #testMergeOnColdStartIntoChromeTabbedActivity2 on Pie.

BUG=1036551

Change-Id: I995f1f4e5aeeb0c533e55fc9b8000e534613e9aa
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2120748
Auto-Submit: Theresa  <twellington@chromium.org>
Commit-Queue: Ted Choc <tedchoc@chromium.org>
Reviewed-by: default avatarJohn Budorick <jbudorick@chromium.org>
Reviewed-by: default avatarTed Choc <tedchoc@chromium.org>
Cr-Commit-Position: refs/heads/master@{#753338}
parent ac7b8f5b
...@@ -394,6 +394,7 @@ public class TabModelMergingTest { ...@@ -394,6 +394,7 @@ public class TabModelMergingTest {
// Send a main intent to restart ChromeTabbedActivity2. // Send a main intent to restart ChromeTabbedActivity2.
Intent CTA2MainIntent = new Intent(Intent.ACTION_MAIN); Intent CTA2MainIntent = new Intent(Intent.ACTION_MAIN);
CTA2MainIntent.setClassName(CTA2PackageName, CTA2ClassName); CTA2MainIntent.setClassName(CTA2PackageName, CTA2ClassName);
CTA2MainIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
InstrumentationRegistry.getInstrumentation().startActivitySync(CTA2MainIntent); InstrumentationRegistry.getInstrumentation().startActivitySync(CTA2MainIntent);
mNewCTA2CallbackHelper.waitForCallback(0); mNewCTA2CallbackHelper.waitForCallback(0);
......
...@@ -21,9 +21,6 @@ ...@@ -21,9 +21,6 @@
# crbug/1032118 # crbug/1032118
-org.chromium.chrome.browser.notifications.StandardNotificationBuilderTest.testSetAll -org.chromium.chrome.browser.notifications.StandardNotificationBuilderTest.testSetAll
# crbug/1036551
-org.chromium.chrome.browser.tabmodel.TabModelMergingTest.testMergeOnColdStartIntoChromeTabbedActivity2
# crbug/1036459 # crbug/1036459
-org.chromium.chrome.browser.ntp.NewTabPageTest.testFocusFakebox -org.chromium.chrome.browser.ntp.NewTabPageTest.testFocusFakebox
......
...@@ -40,9 +40,6 @@ ...@@ -40,9 +40,6 @@
-org.chromium.chrome.browser.suggestions.tile.TileGroupTest.testDismissTileUndo -org.chromium.chrome.browser.suggestions.tile.TileGroupTest.testDismissTileUndo
-org.chromium.chrome.browser.suggestions.tile.TileGroupTest.testDismissTileWithContextMenu -org.chromium.chrome.browser.suggestions.tile.TileGroupTest.testDismissTileWithContextMenu
# crbug/1036551
-org.chromium.chrome.browser.tabmodel.TabModelMergingTest.testMergeOnColdStartIntoChromeTabbedActivity2
# crbug/1017141 # crbug/1017141
-org.chromium.chrome.browser.tasks.tab_management.TabSwitcherMultiWindowTest.testMoveTabsAcrossWindow_GTS_WithoutGroup -org.chromium.chrome.browser.tasks.tab_management.TabSwitcherMultiWindowTest.testMoveTabsAcrossWindow_GTS_WithoutGroup
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment