Commit c128d25d authored by Jochen Eisinger's avatar Jochen Eisinger Committed by Commit Bot

Renable BrowserTest.WindowOpenClose1 and disable DCHECK instead

The browser test predates the DCHECK, so instead of disabling a test
that indicates that triggers a bug somewhere in surface management,
we should temporarily remove the apparently incorrect DCHECK.

BUG=823043
R=mohsen@chromium.org

Change-Id: I03ad6259587b9367bd5940fc5c18da3698746dbe
Reviewed-on: https://chromium-review.googlesource.com/c/1459628
Commit-Queue: Jochen Eisinger <jochen@chromium.org>
Reviewed-by: default avatarMohsen Izadi <mohsen@chromium.org>
Cr-Commit-Position: refs/heads/master@{#630700}
parent 55886771
...@@ -1853,13 +1853,7 @@ IN_PROC_BROWSER_TEST_F(BrowserTest2, NoTabsInPopups) { ...@@ -1853,13 +1853,7 @@ IN_PROC_BROWSER_TEST_F(BrowserTest2, NoTabsInPopups) {
} }
#endif #endif
// Flaky on Chrome OS only. TODO(https://crbug.com/823043) fix it. IN_PROC_BROWSER_TEST_F(BrowserTest, WindowOpenClose1) {
#if defined(OS_CHROMEOS)
#define MAYBE_WindowOpenClose1 DISABLED_WindowOpenClose1
#else
#define MAYBE_WindowOpenClose1 WindowOpenClose1
#endif
IN_PROC_BROWSER_TEST_F(BrowserTest, MAYBE_WindowOpenClose1) {
base::CommandLine::ForCurrentProcess()->AppendSwitch( base::CommandLine::ForCurrentProcess()->AppendSwitch(
switches::kDisablePopupBlocking); switches::kDisablePopupBlocking);
ASSERT_TRUE(embedded_test_server()->Start()); ASSERT_TRUE(embedded_test_server()->Start());
......
...@@ -76,8 +76,9 @@ SurfaceManager::~SurfaceManager() { ...@@ -76,8 +76,9 @@ SurfaceManager::~SurfaceManager() {
// All SurfaceClients and their surfaces are supposed to be // All SurfaceClients and their surfaces are supposed to be
// destroyed before SurfaceManager. // destroyed before SurfaceManager.
DCHECK(surface_map_.empty()); // TODO(crbug.com/823043): The following two DCHECKs don't hold.
DCHECK(surfaces_to_destroy_.empty()); // DCHECK(surface_map_.empty());
// DCHECK(surfaces_to_destroy_.empty());
} }
#if DCHECK_IS_ON() #if DCHECK_IS_ON()
......
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