commit | b306d54665d9d7c563e4e5505003650c46d737fb | [log] [tgz] |
---|---|---|
author | Xi Han <hanxi@google.com> | Wed Apr 14 16:36:10 2021 |
committer | Chromium LUCI CQ <chromium-scoped@luci-project-accounts.iam.gserviceaccount.com> | Wed Apr 14 16:36:10 2021 |
tree | c67fc23a87d06de0c4a26872db44503f5e4d3e59 | |
parent | a6ece4f1dcc40f7f70a7713a2b99544e55af8af6 [diff] |
[Start] Add early return for testShow_SingleAsHomepage_BackButtonOnHomepageWithGroupTabsDialog__Instant_Return (cherry picked from commit 97a24cf10e47454e926a7ff3206059a22c0d2966) Bug: 1192027 Change-Id: I89b5780e10f97c5c989c463de1a5e95b8bd828cc Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2784004 Reviewed-by: Hao Dong <spdonghao@chromium.org> Commit-Queue: Xi Han <hanxi@chromium.org> Cr-Original-Commit-Position: refs/heads/master@{#866118} Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2826250 Reviewed-by: Mei Liang <meiliang@chromium.org> Commit-Queue: Hao Dong <spdonghao@chromium.org> Cr-Commit-Position: refs/branch-heads/4430@{#1265} Cr-Branched-From: e5ce7dc4f7518237b3d9bb93cccca35d25216cbe-refs/heads/master@{#857950}
diff --git a/chrome/android/features/start_surface/internal/javatests/src/org/chromium/chrome/features/start_surface/StartSurfaceTest.java b/chrome/android/features/start_surface/internal/javatests/src/org/chromium/chrome/features/start_surface/StartSurfaceTest.java index 43b77d9..bbbca77a 100644 --- a/chrome/android/features/start_surface/internal/javatests/src/org/chromium/chrome/features/start_surface/StartSurfaceTest.java +++ b/chrome/android/features/start_surface/internal/javatests/src/org/chromium/chrome/features/start_surface/StartSurfaceTest.java
@@ -1699,6 +1699,11 @@ // When show_last_active_tab_only is enabled, we need to enter the tab switcher first to // initialize the secondary task surface which shows the TabSelectionEditor dialog. onViewWaiting(withId(org.chromium.chrome.tab_ui.R.id.tab_switcher_button)); + if (isInstantReturn()) { + // TODO(crbug.com/1076274): fix toolbar to avoid wrongly focusing on the toolbar + // omnibox. + return; + } TabUiTestHelper.enterTabSwitcher(cta); waitForView(withId(R.id.secondary_tasks_surface_view)); List<Tab> tabs =