Commit 4bfbe021 authored by Lucas Furukawa Gadani's avatar Lucas Furukawa Gadani Committed by Commit Bot

Portals: Enable tests on CrOS.

This tests used to fail without viz enabled, but now viz is launched on
ChromeOS as of r726484.

Bug: 1006633
Change-Id: I0809e9dca62b3e0b5b3e8e3ee014675279ee6ea4
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1980506Reviewed-by: default avatarAdithya Srinivasan <adithyas@chromium.org>
Reviewed-by: default avatarAvi Drissman <avi@chromium.org>
Commit-Queue: Avi Drissman <avi@chromium.org>
Cr-Commit-Position: refs/heads/master@{#728574}
parent 8d794457
......@@ -30,13 +30,7 @@ class PortalBrowserTest : public InProcessBrowserTest {
base::test::ScopedFeatureList scoped_feature_list_;
};
// TODO(crbug.com/1006633): Test fails on Chrome OS.
#if defined(OS_CHROMEOS)
#define MAYBE_PortalActivation DISABLED_PortalActivation
#else
#define MAYBE_PortalActivation PortalActivation
#endif
IN_PROC_BROWSER_TEST_F(PortalBrowserTest, MAYBE_PortalActivation) {
IN_PROC_BROWSER_TEST_F(PortalBrowserTest, PortalActivation) {
ASSERT_TRUE(embedded_test_server()->Start());
GURL url(embedded_test_server()->GetURL("/portal/activate.html"));
ui_test_utils::NavigateToURL(browser(), url);
......@@ -55,16 +49,8 @@ IN_PROC_BROWSER_TEST_F(PortalBrowserTest, MAYBE_PortalActivation) {
EXPECT_EQ(portal_contents, tab_strip_model->GetActiveWebContents());
}
// TODO(crbug.com/1006633): Test fails on Chrome OS.
#if defined(OS_CHROMEOS)
#define MAYBE_DevToolsWindowStaysOpenAfterActivation \
DISABLED_DevToolsWindowStaysOpenAfterActivation
#else
#define MAYBE_DevToolsWindowStaysOpenAfterActivation \
DevToolsWindowStaysOpenAfterActivation
#endif
IN_PROC_BROWSER_TEST_F(PortalBrowserTest,
MAYBE_DevToolsWindowStaysOpenAfterActivation) {
DevToolsWindowStaysOpenAfterActivation) {
ASSERT_TRUE(embedded_test_server()->Start());
GURL url(embedded_test_server()->GetURL("/portal/activate.html"));
ui_test_utils::NavigateToURL(browser(), url);
......
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