Chromium Code Reviews| Index: ash/shell_unittest.cc |
| diff --git a/ash/shell_unittest.cc b/ash/shell_unittest.cc |
| index fe929cb67bebf1d3a8ca223a1d8697339b1d31fa..7c1abc307d4251b242461ae04631723506cc4a2a 100644 |
| --- a/ash/shell_unittest.cc |
| +++ b/ash/shell_unittest.cc |
| @@ -459,6 +459,10 @@ TEST_F(ShellTest, ToggleAutoHide) { |
| // Tests that the cursor-filter is ahead of the drag-drop controller in the |
| // pre-target list. |
| TEST_F(ShellTest, TestPreTargetHandlerOrder) { |
| + // TODO: investigate failure in mash, http://crbug.com/695758. |
| + if (WmShell::Get()->IsRunningInMash()) |
| + return; |
| + |
| Shell* shell = Shell::GetInstance(); |
| ui::EventTargetTestApi test_api(shell); |
| test::ShellTestApi shell_test_api(shell); |
| @@ -503,6 +507,12 @@ class ShellTest2 : public test::AshTestBase { |
| }; |
| TEST_F(ShellTest2, DontCrashWhenWindowDeleted) { |
| + // This test isn't applicable to mash as all windows must be destroyed before |
| + // the WindowManager/Shell is. The case of content creating a Window isn't |
| + // valid as content is in another process in mash. |
|
msw
2017/02/24 21:25:35
nit: "a separate process from"? (or more to the po
sky
2017/02/24 21:43:47
Done.
|
| + if (WmShell::Get()->IsRunningInMash()) |
| + return; |
| + |
| window_.reset(new aura::Window(NULL)); |
| window_->Init(ui::LAYER_NOT_DRAWN); |
| } |