Skip to content

GitLab

T
tangled
Commit 71768faf authored by Alex Ilin's avatar Alex Ilin Committed by Commit Bot
Browse files
Options

[sheriff] Revert "TabModel type should same as Tab type when switching tab" 

This reverts commit a1ee3eea.

Reason for revert: SwitchToTabTest#testSwitchToTabSuggestionWhenIncognitoTabOnTop is failing fails on O and P bots

Original change's description:
> TabModel type should same as Tab type when switching tab
> 
> We were use getCurrentModel() to switch tab, and this will be a problem
> in multi window mode. We should choose the model(incognito or not) same
> as the tab which we will switch to.
> 
> Bug: 1121102
> Change-Id: Ie9742fb4a1b38f921c01d7f8ffd47a813b1b5a14
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2379093
> Reviewed-by: Ted Choc <tedchoc@chromium.org>
> Commit-Queue: Gang Wu <gangwu@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#802295}

TBR=tedchoc@chromium.org,gangwu@chromium.org

Change-Id: Ic897ac3efff8f859fb1c2eb6b94997185145820e
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: 1121102, 1122985
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2379899Reviewed-by: default avatarAlex Ilin <alexilin@chromium.org>
Commit-Queue: Alex Ilin <alexilin@chromium.org>
Cr-Commit-Position: refs/heads/master@{#802616}
parent 6adbb767
Hide whitespace changes
Inline Side-by-side
Showing with 11 additions and 57 deletions
chrome/android/java/src/org/chromium/chrome/browser/compositor/layouts/LayoutManagerChrome.java
View file @ 71768faf
......@@ -576,9 +576,7 @@ public class LayoutManagerChrome
Tab lastTab = getTabById(lastTabId);
if (NewTabPage.isNTPUrl(lastTab.getUrl()) && !lastTab.canGoBack()
&& !lastTab.canGoForward()) {
getTabModelSelector()
.getModel(lastTab.isIncognito())
.closeTab(lastTab, tab, false, false, false);
getTabModelSelector().getCurrentModel().closeTab(lastTab, tab, false, false, false);
}
}
}
chrome/android/java/src/org/chromium/chrome/browser/omnibox/suggestions/AutocompleteMediator.java
View file @ 71768faf
......@@ -595,10 +595,9 @@ class AutocompleteMediator implements OnSuggestionsReceivedListener, StartStopWi
ChromeActivity chromeActivity =
(ChromeActivity) tab.getWindowAndroid().getActivity().get();
int tabIndex = TabModelUtils.getTabIndexById(
chromeActivity.getTabModelSelector().getModel(tab.isIncognito()), tab.getId());
chromeActivity.getTabModelSelector()
.getModel(tab.isIncognito())
.setIndex(tabIndex, TabSelectionType.FROM_OMNIBOX);
chromeActivity.getTabModelSelector().getCurrentModel(), tab.getId());
chromeActivity.getTabModelSelector().getCurrentModel().setIndex(
tabIndex, TabSelectionType.FROM_OMNIBOX);
} else {
// Browser is in background, bring to to foreground and switch to the tab.
Intent newIntent = ChromeIntentUtil.createBringTabToFrontIntent(tab.getId());
......
chrome/android/javatests/src/org/chromium/chrome/browser/omnibox/suggestions/SwitchToTabTest.java
View file @ 71768faf
......@@ -4,15 +4,10 @@
package org.chromium.chrome.browser.omnibox.suggestions;
import static org.chromium.chrome.browser.multiwindow.MultiWindowTestHelper.moveActivityToFront;
import static org.chromium.chrome.browser.multiwindow.MultiWindowTestHelper.waitForSecondChromeTabbedActivity;
import static org.chromium.chrome.browser.tasks.tab_management.TabUiTestHelper.createTabs;
import android.app.Activity;
import android.app.Instrumentation;
import android.app.Instrumentation.ActivityMonitor;
import android.content.Intent;
import android.os.Build;
import android.support.test.InstrumentationRegistry;
import android.text.TextUtils;
import android.view.ViewGroup;
......@@ -33,22 +28,18 @@ import org.chromium.base.ActivityState;
import org.chromium.base.ThreadUtils;
import org.chromium.base.test.util.CommandLineFlags;
import org.chromium.base.test.util.DisabledTest;
import org.chromium.base.test.util.MinAndroidSdkLevel;
import org.chromium.chrome.R;
import org.chromium.chrome.browser.ChromeTabbedActivity;
import org.chromium.chrome.browser.ChromeTabbedActivity2;
import org.chromium.chrome.browser.app.ChromeActivity;
import org.chromium.chrome.browser.flags.ChromeSwitches;
import org.chromium.chrome.browser.multiwindow.MultiWindowUtils;
import org.chromium.chrome.browser.omnibox.LocationBarLayout;
import org.chromium.chrome.browser.omnibox.UrlBar;
import org.chromium.chrome.browser.omnibox.suggestions.base.BaseSuggestionView;
import org.chromium.chrome.browser.searchwidget.SearchActivity;
import org.chromium.chrome.browser.searchwidget.SearchWidgetProvider;
import org.chromium.chrome.browser.tab.Tab;
import org.chromium.chrome.test.ChromeActivityTestRule;
import org.chromium.chrome.test.ChromeJUnit4ClassRunner;
import org.chromium.chrome.test.ChromeTabbedActivityTestRule;
import org.chromium.chrome.test.util.ChromeTabUtils;
import org.chromium.chrome.test.util.MenuUtils;
import org.chromium.chrome.test.util.OmniboxTestUtils;
import org.chromium.chrome.test.util.WaitForFocusHelper;
import org.chromium.chrome.test.util.browser.Features.EnableFeatures;
......@@ -69,7 +60,8 @@ import java.util.List;
@CommandLineFlags.Add({ChromeSwitches.DISABLE_FIRST_RUN_EXPERIENCE})
public class SwitchToTabTest {
@Rule
public ChromeTabbedActivityTestRule mActivityTestRule = new ChromeTabbedActivityTestRule();
public ChromeActivityTestRule<ChromeActivity> mActivityTestRule =
new ChromeActivityTestRule<>(ChromeActivity.class);
private static final int INVALID_INDEX = -1;
private EmbeddedTestServer mTestServer;
......@@ -274,44 +266,9 @@ public class SwitchToTabTest {
Tab tab = mActivityTestRule.getActivity().getActivityTab();
Criteria.checkThat(tab, Matchers.notNullValue());
Criteria.checkThat(tab, Matchers.is(aboutTab));
Criteria.checkThat(tab.getUrlString(), Matchers.is(testHttpsUrl1));
});
}
@Test
@MediumTest
@MinAndroidSdkLevel(Build.VERSION_CODES.N)
@EnableFeatures("OmniboxTabSwitchSuggestions")
@CommandLineFlags.Add(ChromeSwitches.DISABLE_TAB_MERGING_FOR_TESTING)
public void testSwitchToTabSuggestionWhenIncognitoTabOnTop() throws InterruptedException {
mTestServer = EmbeddedTestServer.createAndStartHTTPSServer(
InstrumentationRegistry.getInstrumentation().getContext(),
ServerCertificate.CERT_OK);
final String testHttpsUrl1 = mTestServer.getURL("/chrome/test/data/android/about.html");
final String testHttpsUrl2 = mTestServer.getURL("/chrome/test/data/android/ok.txt");
final String testHttpsUrl3 = mTestServer.getURL("/chrome/test/data/android/test.html");
mActivityTestRule.loadUrlInNewTab(testHttpsUrl2);
mActivityTestRule.loadUrlInNewTab(testHttpsUrl3);
final Tab aboutTab = mActivityTestRule.loadUrlInNewTab(testHttpsUrl1);
// Move "about.html" page to cta2 and create an incognito tab on top of "about.html".
final ChromeTabbedActivity cta1 = mActivityTestRule.getActivity();
MultiWindowUtils.getInstance().setIsInMultiWindowModeForTesting(true);
MenuUtils.invokeCustomMenuActionSync(InstrumentationRegistry.getInstrumentation(), cta1,
R.id.move_to_other_window_menu_id);
final ChromeTabbedActivity2 cta2 = waitForSecondChromeTabbedActivity();
createTabs(cta2, true, 1);
moveActivityToFront(cta1);
// Switch back to cta1, and try to switch to "about.html" in cta2.
LocationBarLayout locationBarLayout =
(LocationBarLayout) cta1.findViewById(R.id.location_bar);
typeAndClickMatchingTabMatchSuggestion(cta1, locationBarLayout, aboutTab);
CriteriaHelper.pollUiThread(() -> {
Tab tab = cta2.getActivityTab();
Criteria.checkThat(tab, Matchers.notNullValue());
Criteria.checkThat(tab, Matchers.is(aboutTab));
// Make sure tab is in either upload page or result page. cannot only verify one of
// them since on fast device tab jump to result page really quick but on slow device
// may stay on upload page for a really long time.
Criteria.checkThat(tab.getUrlString(), Matchers.is(testHttpsUrl1));
});
}
......
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