Commit 4d96f549 authored by Joe Downing's avatar Joe Downing Committed by Commit Bot

[KeyboardLock] Enable BrowserTests for all platforms

Now that all desktop platforms have a browser-level implementation
for keyboard lock, it is time to remove the platform restriction
for the keyboard lock BrowserTests.

BUG=680809

Change-Id: Iad4ddea988069a73dd6cb31683a3a2086c753c47
Reviewed-on: https://chromium-review.googlesource.com/1042542Reviewed-by: default avatarScott Violet <sky@chromium.org>
Commit-Queue: Joe Downing <joedow@chromium.org>
Cr-Commit-Position: refs/heads/master@{#555880}
parent a2a7ea39
...@@ -31,13 +31,6 @@ namespace content { ...@@ -31,13 +31,6 @@ namespace content {
namespace { namespace {
// TODO(joedow): Enable tests on additional platforms as they are implemented.
#if defined(OS_WIN) || defined(OS_MACOSX)
#define MAYBE_RUN(test_name) test_name
#else
#define MAYBE_RUN(test_name) DISABLED_##test_name
#endif
constexpr char kFullscreenFrameName[] = "/fullscreen_frame.html"; constexpr char kFullscreenFrameName[] = "/fullscreen_frame.html";
constexpr char kKeyboardLockMethodExistanceCheck[] = constexpr char kKeyboardLockMethodExistanceCheck[] =
...@@ -370,42 +363,38 @@ void KeyboardLockDisabledBrowserTest::SetUpFeatureList() { ...@@ -370,42 +363,38 @@ void KeyboardLockDisabledBrowserTest::SetUpFeatureList() {
feature_list()->InitAndDisableFeature(features::kKeyboardLockAPI); feature_list()->InitAndDisableFeature(features::kKeyboardLockAPI);
} }
IN_PROC_BROWSER_TEST_F(KeyboardLockBrowserTest, MAYBE_RUN(SingleLockCall)) { IN_PROC_BROWSER_TEST_F(KeyboardLockBrowserTest, SingleLockCall) {
NavigateToTestURL(); NavigateToTestURL();
RequestKeyboardLock(FROM_HERE); RequestKeyboardLock(FROM_HERE);
// Don't explicitly call CancelKeyboardLock(). // Don't explicitly call CancelKeyboardLock().
} }
IN_PROC_BROWSER_TEST_F(KeyboardLockBrowserTest, IN_PROC_BROWSER_TEST_F(KeyboardLockBrowserTest, SingleLockCallForSomeKeys) {
MAYBE_RUN(SingleLockCallForSomeKeys)) {
NavigateToTestURL(); NavigateToTestURL();
RequestKeyboardLock(FROM_HERE, /*lock_all_keys=*/false); RequestKeyboardLock(FROM_HERE, /*lock_all_keys=*/false);
// Don't explicitly call CancelKeyboardLock(). // Don't explicitly call CancelKeyboardLock().
} }
IN_PROC_BROWSER_TEST_F(KeyboardLockBrowserTest, IN_PROC_BROWSER_TEST_F(KeyboardLockBrowserTest, SingleLockWithCancelCall) {
MAYBE_RUN(SingleLockWithCancelCall)) {
NavigateToTestURL(); NavigateToTestURL();
RequestKeyboardLock(FROM_HERE); RequestKeyboardLock(FROM_HERE);
CancelKeyboardLock(FROM_HERE); CancelKeyboardLock(FROM_HERE);
} }
IN_PROC_BROWSER_TEST_F(KeyboardLockBrowserTest, IN_PROC_BROWSER_TEST_F(KeyboardLockBrowserTest, LockCalledBeforeFullscreen) {
MAYBE_RUN(LockCalledBeforeFullscreen)) {
NavigateToTestURL(); NavigateToTestURL();
RequestKeyboardLock(FROM_HERE); RequestKeyboardLock(FROM_HERE);
EnterFullscreen(FROM_HERE); EnterFullscreen(FROM_HERE);
} }
IN_PROC_BROWSER_TEST_F(KeyboardLockBrowserTest, IN_PROC_BROWSER_TEST_F(KeyboardLockBrowserTest, LockCalledAfterFullscreen) {
MAYBE_RUN(LockCalledAfterFullscreen)) {
NavigateToTestURL(); NavigateToTestURL();
EnterFullscreen(FROM_HERE); EnterFullscreen(FROM_HERE);
RequestKeyboardLock(FROM_HERE); RequestKeyboardLock(FROM_HERE);
} }
IN_PROC_BROWSER_TEST_F(KeyboardLockBrowserTest, IN_PROC_BROWSER_TEST_F(KeyboardLockBrowserTest,
MAYBE_RUN(LockAndCancelCyclingNoActivation)) { LockAndCancelCyclingNoActivation) {
NavigateToTestURL(); NavigateToTestURL();
RequestKeyboardLock(FROM_HERE); RequestKeyboardLock(FROM_HERE);
...@@ -419,7 +408,7 @@ IN_PROC_BROWSER_TEST_F(KeyboardLockBrowserTest, ...@@ -419,7 +408,7 @@ IN_PROC_BROWSER_TEST_F(KeyboardLockBrowserTest,
} }
IN_PROC_BROWSER_TEST_F(KeyboardLockBrowserTest, IN_PROC_BROWSER_TEST_F(KeyboardLockBrowserTest,
MAYBE_RUN(LockAndCancelCyclingInFullscreen)) { LockAndCancelCyclingInFullscreen) {
NavigateToTestURL(); NavigateToTestURL();
EnterFullscreen(FROM_HERE); EnterFullscreen(FROM_HERE);
...@@ -436,7 +425,7 @@ IN_PROC_BROWSER_TEST_F(KeyboardLockBrowserTest, ...@@ -436,7 +425,7 @@ IN_PROC_BROWSER_TEST_F(KeyboardLockBrowserTest,
CancelKeyboardLock(FROM_HERE); CancelKeyboardLock(FROM_HERE);
} }
IN_PROC_BROWSER_TEST_F(KeyboardLockBrowserTest, MAYBE_RUN(CancelInFullscreen)) { IN_PROC_BROWSER_TEST_F(KeyboardLockBrowserTest, CancelInFullscreen) {
NavigateToTestURL(); NavigateToTestURL();
RequestKeyboardLock(FROM_HERE); RequestKeyboardLock(FROM_HERE);
...@@ -445,8 +434,7 @@ IN_PROC_BROWSER_TEST_F(KeyboardLockBrowserTest, MAYBE_RUN(CancelInFullscreen)) { ...@@ -445,8 +434,7 @@ IN_PROC_BROWSER_TEST_F(KeyboardLockBrowserTest, MAYBE_RUN(CancelInFullscreen)) {
ExitFullscreen(FROM_HERE); ExitFullscreen(FROM_HERE);
} }
IN_PROC_BROWSER_TEST_F(KeyboardLockBrowserTest, IN_PROC_BROWSER_TEST_F(KeyboardLockBrowserTest, EnterAndExitFullscreenCycling) {
MAYBE_RUN(EnterAndExitFullscreenCycling)) {
NavigateToTestURL(); NavigateToTestURL();
RequestKeyboardLock(FROM_HERE); RequestKeyboardLock(FROM_HERE);
...@@ -461,8 +449,7 @@ IN_PROC_BROWSER_TEST_F(KeyboardLockBrowserTest, ...@@ -461,8 +449,7 @@ IN_PROC_BROWSER_TEST_F(KeyboardLockBrowserTest,
ExitFullscreen(FROM_HERE); ExitFullscreen(FROM_HERE);
} }
IN_PROC_BROWSER_TEST_F(KeyboardLockBrowserTest, IN_PROC_BROWSER_TEST_F(KeyboardLockBrowserTest, GainAndLoseFocusInWindowMode) {
MAYBE_RUN(GainAndLoseFocusInWindowMode)) {
NavigateToTestURL(); NavigateToTestURL();
RequestKeyboardLock(FROM_HERE); RequestKeyboardLock(FROM_HERE);
...@@ -473,8 +460,7 @@ IN_PROC_BROWSER_TEST_F(KeyboardLockBrowserTest, ...@@ -473,8 +460,7 @@ IN_PROC_BROWSER_TEST_F(KeyboardLockBrowserTest,
BlurContent(FROM_HERE); BlurContent(FROM_HERE);
} }
IN_PROC_BROWSER_TEST_F(KeyboardLockBrowserTest, IN_PROC_BROWSER_TEST_F(KeyboardLockBrowserTest, EnterFullscreenWithoutFocus) {
MAYBE_RUN(EnterFullscreenWithoutFocus)) {
NavigateToTestURL(); NavigateToTestURL();
RequestKeyboardLock(FROM_HERE); RequestKeyboardLock(FROM_HERE);
...@@ -488,7 +474,7 @@ IN_PROC_BROWSER_TEST_F(KeyboardLockBrowserTest, ...@@ -488,7 +474,7 @@ IN_PROC_BROWSER_TEST_F(KeyboardLockBrowserTest,
} }
IN_PROC_BROWSER_TEST_F(KeyboardLockBrowserTest, IN_PROC_BROWSER_TEST_F(KeyboardLockBrowserTest,
MAYBE_RUN(GainAndLoseFocusCyclingInFullscreen)) { GainAndLoseFocusCyclingInFullscreen) {
NavigateToTestURL(); NavigateToTestURL();
RequestKeyboardLock(FROM_HERE); RequestKeyboardLock(FROM_HERE);
...@@ -508,13 +494,13 @@ IN_PROC_BROWSER_TEST_F(KeyboardLockBrowserTest, ...@@ -508,13 +494,13 @@ IN_PROC_BROWSER_TEST_F(KeyboardLockBrowserTest,
ExitFullscreen(FROM_HERE); ExitFullscreen(FROM_HERE);
} }
IN_PROC_BROWSER_TEST_F(KeyboardLockBrowserTest, MAYBE_RUN(CancelWithoutLock)) { IN_PROC_BROWSER_TEST_F(KeyboardLockBrowserTest, CancelWithoutLock) {
NavigateToTestURL(); NavigateToTestURL();
CancelKeyboardLock(FROM_HERE); CancelKeyboardLock(FROM_HERE);
CancelKeyboardLock(FROM_HERE); CancelKeyboardLock(FROM_HERE);
} }
IN_PROC_BROWSER_TEST_F(KeyboardLockBrowserTest, MAYBE_RUN(MultipleLockCalls)) { IN_PROC_BROWSER_TEST_F(KeyboardLockBrowserTest, MultipleLockCalls) {
NavigateToTestURL(); NavigateToTestURL();
RequestKeyboardLock(FROM_HERE); RequestKeyboardLock(FROM_HERE);
...@@ -522,8 +508,7 @@ IN_PROC_BROWSER_TEST_F(KeyboardLockBrowserTest, MAYBE_RUN(MultipleLockCalls)) { ...@@ -522,8 +508,7 @@ IN_PROC_BROWSER_TEST_F(KeyboardLockBrowserTest, MAYBE_RUN(MultipleLockCalls)) {
RequestKeyboardLock(FROM_HERE); RequestKeyboardLock(FROM_HERE);
} }
IN_PROC_BROWSER_TEST_F(KeyboardLockBrowserTest, IN_PROC_BROWSER_TEST_F(KeyboardLockBrowserTest, MultipleCancelCalls) {
MAYBE_RUN(MultipleCancelCalls)) {
NavigateToTestURL(); NavigateToTestURL();
RequestKeyboardLock(FROM_HERE); RequestKeyboardLock(FROM_HERE);
...@@ -533,8 +518,7 @@ IN_PROC_BROWSER_TEST_F(KeyboardLockBrowserTest, ...@@ -533,8 +518,7 @@ IN_PROC_BROWSER_TEST_F(KeyboardLockBrowserTest,
CancelKeyboardLock(FROM_HERE); CancelKeyboardLock(FROM_HERE);
} }
IN_PROC_BROWSER_TEST_F(KeyboardLockBrowserTest, IN_PROC_BROWSER_TEST_F(KeyboardLockBrowserTest, LockCallWithAllInvalidKeys) {
MAYBE_RUN(LockCallWithAllInvalidKeys)) {
NavigateToTestURL(); NavigateToTestURL();
bool result; bool result;
...@@ -548,8 +532,7 @@ IN_PROC_BROWSER_TEST_F(KeyboardLockBrowserTest, ...@@ -548,8 +532,7 @@ IN_PROC_BROWSER_TEST_F(KeyboardLockBrowserTest,
EnterFullscreen(FROM_HERE); EnterFullscreen(FROM_HERE);
} }
IN_PROC_BROWSER_TEST_F(KeyboardLockBrowserTest, IN_PROC_BROWSER_TEST_F(KeyboardLockBrowserTest, LockCallWithSomeInvalidKeys) {
MAYBE_RUN(LockCallWithSomeInvalidKeys)) {
NavigateToTestURL(); NavigateToTestURL();
bool result; bool result;
...@@ -564,37 +547,37 @@ IN_PROC_BROWSER_TEST_F(KeyboardLockBrowserTest, ...@@ -564,37 +547,37 @@ IN_PROC_BROWSER_TEST_F(KeyboardLockBrowserTest,
} }
IN_PROC_BROWSER_TEST_F(KeyboardLockDisabledBrowserTest, IN_PROC_BROWSER_TEST_F(KeyboardLockDisabledBrowserTest,
MAYBE_RUN(NoKeyboardLockWhenDisabled)) { NoKeyboardLockWhenDisabled) {
ASSERT_TRUE(NavigateToURL(shell(), https_fullscreen_frame())); ASSERT_TRUE(NavigateToURL(shell(), https_fullscreen_frame()));
ASSERT_FALSE(KeyboardLockApiExists()); ASSERT_FALSE(KeyboardLockApiExists());
} }
IN_PROC_BROWSER_TEST_F(KeyboardLockBrowserTest, IN_PROC_BROWSER_TEST_F(KeyboardLockBrowserTest,
MAYBE_RUN(KeyboardLockNotAllowedForIFrame)) { KeyboardLockNotAllowedForIFrame) {
// TODO(joedow): IMPLEMENT. // TODO(joedow): IMPLEMENT.
} }
IN_PROC_BROWSER_TEST_F(KeyboardLockBrowserTest, IN_PROC_BROWSER_TEST_F(KeyboardLockBrowserTest,
MAYBE_RUN(KeyboardUnlockedWhenNavigatingAway)) { KeyboardUnlockedWhenNavigatingAway) {
// TODO(joedow): IMPLEMENT. // TODO(joedow): IMPLEMENT.
} }
IN_PROC_BROWSER_TEST_F(KeyboardLockBrowserTest, IN_PROC_BROWSER_TEST_F(KeyboardLockBrowserTest,
MAYBE_RUN(CrossOriginIFrameDoesNotReceiveInput)) { CrossOriginIFrameDoesNotReceiveInput) {
// TODO(joedow): Added per code review feedback. // TODO(joedow): Added per code review feedback.
// Steps: Main frame initiates keyboard lock and goes fullscreen. Is input // Steps: Main frame initiates keyboard lock and goes fullscreen. Is input
// delivered to cross-origin iFrame? // delivered to cross-origin iFrame?
} }
IN_PROC_BROWSER_TEST_F(KeyboardLockBrowserTest, IN_PROC_BROWSER_TEST_F(KeyboardLockBrowserTest,
MAYBE_RUN(CrossOriginIFrameRequestsFullscreen)) { CrossOriginIFrameRequestsFullscreen) {
// TODO(joedow): Added per code review feedback. // TODO(joedow): Added per code review feedback.
// Steps: Main frame requests keyboard lock, cross-origin iFrame goes // Steps: Main frame requests keyboard lock, cross-origin iFrame goes
// fullscreen. Should KeyboardLock be triggered in that case (presumably no). // fullscreen. Should KeyboardLock be triggered in that case (presumably no).
} }
IN_PROC_BROWSER_TEST_F(KeyboardLockBrowserTest, IN_PROC_BROWSER_TEST_F(KeyboardLockBrowserTest,
MAYBE_RUN(LockRequestWhileIFrameIsFullscreen)) { LockRequestWhileIFrameIsFullscreen) {
// TODO(joedow): Added per code review feedback. // TODO(joedow): Added per code review feedback.
// Steps: 1. Load a page with a cross-site iframe: call main frame "A" and the // Steps: 1. Load a page with a cross-site iframe: call main frame "A" and the
// subframe "B" // subframe "B"
...@@ -603,14 +586,14 @@ IN_PROC_BROWSER_TEST_F(KeyboardLockBrowserTest, ...@@ -603,14 +586,14 @@ IN_PROC_BROWSER_TEST_F(KeyboardLockBrowserTest,
} }
IN_PROC_BROWSER_TEST_F(KeyboardLockBrowserTest, IN_PROC_BROWSER_TEST_F(KeyboardLockBrowserTest,
MAYBE_RUN(LockRequestFailsFromInnerWebContents)) { LockRequestFailsFromInnerWebContents) {
// TODO(joedow): Added per code review feedback. // TODO(joedow): Added per code review feedback.
// Steps: Try requesting KeyboardLock from with an inner WebContents context. // Steps: Try requesting KeyboardLock from with an inner WebContents context.
// See: CreateAndAttachInnerContents() helper method in // See: CreateAndAttachInnerContents() helper method in
// https://cs.chromium.org/chromium/src/content/public/test/test_utils.h // https://cs.chromium.org/chromium/src/content/public/test/test_utils.h
} }
IN_PROC_BROWSER_TEST_F(KeyboardLockBrowserTest, MAYBE_RUN(HistogramTest)) { IN_PROC_BROWSER_TEST_F(KeyboardLockBrowserTest, HistogramTest) {
// TODO(joedow): Added per code review feedback. // TODO(joedow): Added per code review feedback.
// Steps: Call the API methods and verify the histogram data is accurate using // Steps: Call the API methods and verify the histogram data is accurate using
// base::HistogramTester. Alternatively, this could be integrated with the // base::HistogramTester. Alternatively, this could be integrated with the
......
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