Commit e5f1d62c authored by Caitlin Fischer's avatar Caitlin Fischer Committed by Commit Bot

Enable testIncognitoPlusRegular.

Opening tabs was used as a workaround to avoid continuous animations
problems crbug.com/640977.

Bug: 1033726
Change-Id: I9962f219e955fe7026666134aee4c3d444a68822
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2297316
Commit-Queue: Olivier Robin <olivierrobin@chromium.org>
Reviewed-by: default avatarOlivier Robin <olivierrobin@chromium.org>
Cr-Commit-Position: refs/heads/master@{#788537}
parent a5aaad66
......@@ -189,13 +189,17 @@ using chrome_test_util::SettingsDoneButton;
//
// Corresponds to IncognitoPlusRegularCheck in //chrome/browser/metrics/
// ukm_browsertest.cc.
// TODO(crbug.com/1033726): This test is flaky on iOS 12 and 13.
- (void)DISABLED_testIncognitoPlusRegular {
- (void)testIncognitoPlusRegular {
const uint64_t originalClientID = [MetricsAppInterface UKMClientID];
[ChromeEarlGrey closeAllTabs];
[ChromeEarlGrey waitForMainTabCount:0];
// TODO(crbug.com/640977): Due to continuous animations, it is not feasible
// to close the regular tab that is already open. The functions closeAllTabs,
// closeCurrentTab, and closeAllTabsInCurrentMode close the tab and then hang.
//
// As a workaround, we open an incognito tab and then close the regular tab to
// get to a state in which a single incognito tab is open.
[self openNewIncognitoTab];
[ChromeEarlGrey closeAllNormalTabs];
GREYAssert([MetricsAppInterface checkUKMRecordingEnabled:NO],
@"Failed to assert that UKM was not enabled.");
......@@ -205,7 +209,6 @@ using chrome_test_util::SettingsDoneButton;
@"Failed to assert that UKM was not enabled.");
[ChromeEarlGrey closeAllIncognitoTabs];
[ChromeEarlGrey waitForIncognitoTabCount:0];
GREYAssert([MetricsAppInterface checkUKMRecordingEnabled:YES],
@"Failed to assert that UKM was enabled.");
......
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