chrome/test/android/javatests/src/org/chromium/chrome/test/util/FullscreenTestUtils.java - Issue 2203223002: Revert "Separate deferred startup into tasks."

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/test/android/javatests/src/org/chromium/chrome/test/util/FullscreenTestUtils.java

Issue 2203223002: Revert "Separate deferred startup into tasks." (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 4 years, 4 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/test/android/javatests/src/org/chromium/chrome/test/ChromeActivityTestCaseBase.java ('k') | tools/metrics/histograms/histograms.xml » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/test/android/javatests/src/org/chromium/chrome/test/util/FullscreenTestUtils.java

diff --git a/chrome/test/android/javatests/src/org/chromium/chrome/test/util/FullscreenTestUtils.java b/chrome/test/android/javatests/src/org/chromium/chrome/test/util/FullscreenTestUtils.java

index 5be3a00f980648969ddd4c1ae3f7688d358d4389..ba80d74d87bc8184d0b398ae43d63dcdb82ec703 100644

--- a/chrome/test/android/javatests/src/org/chromium/chrome/test/util/FullscreenTestUtils.java

+++ b/chrome/test/android/javatests/src/org/chromium/chrome/test/util/FullscreenTestUtils.java

@@ -4,8 +4,6 @@

package org.chromium.chrome.test.util;

-import static org.chromium.base.test.util.ScalableTimeout.scaleTimeout;

import android.app.Activity;

import android.os.Build;

import android.view.View;

@@ -72,7 +70,7 @@ public class FullscreenTestUtils {

public boolean isSatisfied() {

return isFullscreenFlagSet(tab, state, activity);

}

- }, scaleTimeout(6000), CriteriaHelper.DEFAULT_POLLING_INTERVAL);

+ });

}

/**