Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1687)

Unified Diff: ash/common/wm/workspace/workspace_layout_manager_unittest.cc

Issue 2409053002: mash: Use null AcceleratedWidget for widgets in tests (Closed)
Patch Set: . Created 4 years, 2 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 | « no previous file | mash/test/mash_test_suite.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/common/wm/workspace/workspace_layout_manager_unittest.cc
diff --git a/ash/common/wm/workspace/workspace_layout_manager_unittest.cc b/ash/common/wm/workspace/workspace_layout_manager_unittest.cc
index fa4fb1bcaa015bb8af9d3249cebbe6611868ca97..cdb69e4cc5a818bd1fce86602e6aebc2362cdf1e 100644
--- a/ash/common/wm/workspace/workspace_layout_manager_unittest.cc
+++ b/ash/common/wm/workspace/workspace_layout_manager_unittest.cc
@@ -934,19 +934,11 @@ class WorkspaceLayoutManagerBackdropTest : public AshTest {
// Check that creating the BackDrop without destroying it does not lead into
// a crash.
TEST_F(WorkspaceLayoutManagerBackdropTest, BackdropCrashTest) {
- // TODO: Triggers crash in mash: http://crbug.com/652871.
- if (WmShell::Get()->IsRunningInMash())
- return;
-
ShowTopWindowBackdrop(true);
}
// Verify basic assumptions about the backdrop.
TEST_F(WorkspaceLayoutManagerBackdropTest, BasicBackdropTests) {
- // TODO: Triggers crash in mash: http://crbug.com/652871.
- if (WmShell::Get()->IsRunningInMash())
- return;
-
// Create a backdrop and see that there is one window (the backdrop) and
// that the size is the same as the default container as well as that it is
// not visible.
@@ -979,10 +971,6 @@ TEST_F(WorkspaceLayoutManagerBackdropTest, BasicBackdropTests) {
// Verify that the backdrop gets properly created and placed.
TEST_F(WorkspaceLayoutManagerBackdropTest, VerifyBackdropAndItsStacking) {
- // TODO: Triggers crash in mash: http://crbug.com/652871.
- if (WmShell::Get()->IsRunningInMash())
- return;
-
std::unique_ptr<WindowOwner> window1_owner(
CreateTestWindow(gfx::Rect(1, 2, 3, 4)));
WmWindow* window1 = window1_owner->window();
@@ -1037,10 +1025,6 @@ TEST_F(WorkspaceLayoutManagerBackdropTest, VerifyBackdropAndItsStacking) {
// Tests that when hidding the shelf, that the backdrop resizes to fill the
// entire workspace area.
TEST_F(WorkspaceLayoutManagerBackdropTest, ShelfVisibilityChangesBounds) {
- // TODO: Triggers crash in mash: http://crbug.com/652871.
- if (WmShell::Get()->IsRunningInMash())
- return;
-
WmShelf* shelf = GetPrimaryShelf();
ShelfLayoutManager* shelf_layout_manager = shelf->shelf_layout_manager();
ShowTopWindowBackdrop(true);
« no previous file with comments | « no previous file | mash/test/mash_test_suite.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698