| Index: ash/display/display_manager_unittest.cc
|
| diff --git a/ash/display/display_manager_unittest.cc b/ash/display/display_manager_unittest.cc
|
| index 393fe0ce2722585aa1ccca35160d16416c43e2a9..4d39f6141b271d44e50b65c6f851cc911d5c4c7c 100644
|
| --- a/ash/display/display_manager_unittest.cc
|
| +++ b/ash/display/display_manager_unittest.cc
|
| @@ -5,7 +5,7 @@
|
| #include "ash/display/display_manager.h"
|
|
|
| #include "ash/accelerators/accelerator_commands_aura.h"
|
| -#include "ash/common/ash_switches.h"
|
| +
|
| #include "ash/common/material_design/material_design_controller.h"
|
| #include "ash/common/wm/window_state.h"
|
| #include "ash/display/display_configuration_controller.h"
|
| @@ -31,6 +31,7 @@
|
| #include "ui/base/l10n/l10n_util.h"
|
| #include "ui/display/display.h"
|
| #include "ui/display/display_observer.h"
|
| +#include "ui/display/display_switches.h"
|
| #include "ui/display/manager/display_layout_builder.h"
|
| #include "ui/display/manager/display_layout_store.h"
|
| #include "ui/display/manager/display_manager_utilities.h"
|
| @@ -2203,8 +2204,8 @@ class FontTestHelper : public test::AshTestBase {
|
| gfx::ClearFontRenderParamsCacheForTest();
|
| base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
|
| if (display_type == INTERNAL)
|
| - command_line->AppendSwitch(switches::kAshUseFirstDisplayAsInternal);
|
| - command_line->AppendSwitchASCII(switches::kAshHostWindowBounds,
|
| + command_line->AppendSwitch(::switches::kUseFirstDisplayAsInternal);
|
| + command_line->AppendSwitchASCII(::switches::kHostWindowBounds,
|
| StringPrintf("1000x800*%f", scale));
|
| SetUp();
|
| }
|
|
|