Chromium Code Reviews| Index: ash/mus/test/ash_test_impl_mus.cc |
| diff --git a/ash/mus/test/ash_test_impl_mus.cc b/ash/mus/test/ash_test_impl_mus.cc |
| index 92e5bb591200e073140e5e4eb45b7f90829396c7..b9e5f50f8e136d77fc36e0c8513c1120376a4d3b 100644 |
| --- a/ash/mus/test/ash_test_impl_mus.cc |
| +++ b/ash/mus/test/ash_test_impl_mus.cc |
| @@ -6,10 +6,12 @@ |
| #include "ash/test/ash_test.h" |
| #include "ash/wm_window.h" |
| +#include "base/command_line.h" |
| #include "base/memory/ptr_util.h" |
| #include "services/ui/public/cpp/property_type_converters.h" |
| #include "services/ui/public/interfaces/window_manager.mojom.h" |
| #include "ui/aura/window.h" |
| +#include "ui/display/display_switches.h" |
| #include "ui/wm/core/window_util.h" |
| namespace ash { |
| @@ -40,6 +42,13 @@ AshTestImplMus::AshTestImplMus() |
| AshTestImplMus::~AshTestImplMus() {} |
| void AshTestImplMus::SetUp() { |
| + // This matches what AshTestBase does. |
| + base::CommandLine* command_line = base::CommandLine::ForCurrentProcess(); |
| + if (!command_line->HasSwitch(::switches::kHostWindowBounds)) { |
|
kylechar
2017/04/26 16:41:44
Do tests need this to pass?
sky
2017/04/26 19:36:41
Yes as otherwise the root ends up at a different s
|
| + command_line->AppendSwitchASCII(::switches::kHostWindowBounds, |
| + "1+1-800x600"); |
| + } |
| + |
| wm_test_base_->SetUp(); |
| } |