Move ash::DisplayManager switches to ui::display

ash/display/mirror_window_controller_unittest.cc

 // Copyright (c) 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ash/display/mirror_window_controller.h"
 
-#include "ash/common/ash_switches.h"
 #include "ash/display/display_manager.h"
 #include "ash/display/window_tree_host_manager.h"
 #include "ash/screen_util.h"
 #include "ash/shell.h"
 #include "ash/test/ash_test_base.h"
 #include "ash/test/cursor_manager_test_api.h"
 #include "ash/test/display_manager_test_api.h"
 #include "ash/test/mirror_window_test_api.h"
 #include "base/command_line.h"
 #include "base/strings/stringprintf.h"
 #include "ui/aura/env.h"
 #include "ui/aura/test/test_window_delegate.h"
 #include "ui/aura/test/test_windows.h"
 #include "ui/aura/window.h"
 #include "ui/aura/window_event_dispatcher.h"
 #include "ui/base/hit_test.h"
+#include "ui/display/display_switches.h"
 #include "ui/events/test/event_generator.h"
 
 namespace ash {
 
 namespace {
 display::ManagedDisplayInfo CreateDisplayInfo(int64_t id,
                                               const gfx::Rect& bounds) {
   display::ManagedDisplayInfo info(
       id, base::StringPrintf("x-%d", static_cast<int>(id)), false);
   info.SetBounds(bounds);
   return info;
 }
 
 class MirrorOnBootTest : public test::AshTestBase {
  public:
   MirrorOnBootTest() {}
   ~MirrorOnBootTest() override {}
 
   void SetUp() override {
     base::CommandLine::ForCurrentProcess()->AppendSwitchASCII(
-        switches::kAshHostWindowBounds, "1+1-300x300,1+301-300x300");
+        ::switches::kHostWindowBounds, "1+1-300x300,1+301-300x300");
     base::CommandLine::ForCurrentProcess()->AppendSwitch(
-        switches::kAshEnableSoftwareMirroring);
+        ::switches::kEnableSoftwareMirroring);
     test::AshTestBase::SetUp();
   }
   void TearDown() override { test::AshTestBase::TearDown(); }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(MirrorOnBootTest);
 };
 }
 
 typedef test::AshTestBase MirrorWindowControllerTest;
@@ skipping 243 matching lines @@
 
 TEST_F(MirrorOnBootTest, MAYBE_MirrorOnBoot) {
   DisplayManager* display_manager = Shell::GetInstance()->display_manager();
   EXPECT_TRUE(display_manager->IsInMirrorMode());
   RunAllPendingInMessageLoop();
   test::MirrorWindowTestApi test_api;
   EXPECT_TRUE(test_api.GetHost());
 }
 
 }  // namespace ash