Move ash::DisplayManager switches to ui::display

ash/system/overview/overview_button_tray_unittest.cc

 // Copyright 2014 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/common/system/overview/overview_button_tray.h"
 
-#include "ash/common/ash_switches.h"
 #include "ash/common/login_status.h"
 #include "ash/common/shelf/shelf_types.h"
 #include "ash/common/system/status_area_widget.h"
 #include "ash/common/wm/maximize_mode/maximize_mode_controller.h"
 #include "ash/common/wm/overview/window_selector_controller.h"
 #include "ash/common/wm_shell.h"
 #include "ash/display/display_manager.h"
 #include "ash/root_window_controller.h"
 #include "ash/rotator/screen_rotation_animator.h"
 #include "ash/shell.h"
 #include "ash/test/ash_test_base.h"
 #include "ash/test/ash_test_helper.h"
 #include "ash/test/status_area_widget_test_helper.h"
 #include "ash/test/test_session_state_delegate.h"
 #include "base/command_line.h"
 #include "base/test/user_action_tester.h"
 #include "base/time/time.h"
 #include "ui/aura/client/aura_constants.h"
 #include "ui/aura/window.h"
 #include "ui/compositor/scoped_animation_duration_scale_mode.h"
+#include "ui/display/display_switches.h"
 #include "ui/events/event.h"
 #include "ui/events/event_constants.h"
 #include "ui/events/gestures/gesture_types.h"
 #include "ui/views/controls/image_view.h"
 
 namespace ash {
 
 namespace {
 
 const char kTrayOverview[] = "Tray_Overview";
@@ skipping 24 matching lines @@
   views::ImageView* GetImageView(OverviewButtonTray* tray) {
     return tray->icon_;
   }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(OverviewButtonTrayTest);
 };
 
 void OverviewButtonTrayTest::SetUp() {
   base::CommandLine::ForCurrentProcess()->AppendSwitch(
-      switches::kAshUseFirstDisplayAsInternal);
+      ::switches::kUseFirstDisplayAsInternal);
   AshTestBase::SetUp();
 }
 
 void OverviewButtonTrayTest::NotifySessionStateChanged() {
   GetTray()->SessionStateChanged(
       test::AshTestHelper::GetTestSessionStateDelegate()->GetSessionState());
 }
 
 // Ensures that creation doesn't cause any crashes and adds the image icon.
 TEST_F(OverviewButtonTrayTest, BasicConstruction) {
@@ skipping 177 matching lines @@
   ASSERT_TRUE(WmShell::Get()->IsSystemModalWindowOpen());
   WmShell::Get()->maximize_mode_controller()->EnableMaximizeModeWindowManager(
       true);
   EXPECT_TRUE(GetTray()->visible());
   WmShell::Get()->maximize_mode_controller()->EnableMaximizeModeWindowManager(
       false);
   EXPECT_FALSE(GetTray()->visible());
 }
 
 }  // namespace ash