Relocate display_manager from ash to ui

ash/utility/screenshot_controller_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/utility/screenshot_controller.h"
 
 #include "ash/display/cursor_window_controller.h"
 #include "ash/display/mouse_cursor_event_filter.h"
 #include "ash/display/window_tree_host_manager.h"
 #include "ash/screenshot_delegate.h"
 #include "ash/shell.h"
 #include "ash/test/ash_test_base.h"
-#include "ash/test/display_manager_test_api.h"
 #include "ash/test/mirror_window_test_api.h"
 #include "ash/test/test_screenshot_delegate.h"
 #include "ash/wm/window_util.h"
 #include "ui/aura/env.h"
 #include "ui/aura/window_event_dispatcher.h"
 #include "ui/base/cursor/cursor.h"
+#include "ui/display/test/display_manager_test_api.h"

[kylechar, 2016/10/24 14:55:15]

Is this needed or should it be ui/display/manager/display_manager.h instead?

[oshima, 2016/10/24 19:29:16]

You don't need the definition of DisplayManager to use TestAPI,
although this include seems to be obsolete.

[rjkroege, 2016/10/25 23:30:26]

not needed. Done.

[rjkroege, 2016/10/25 23:30:26]

Done.

 #include "ui/events/test/event_generator.h"
 #include "ui/wm/core/cursor_manager.h"
 
 namespace ash {
 
 class ScreenshotControllerTest : public test::AshTestBase {
  public:
   ScreenshotControllerTest() {}
   ~ScreenshotControllerTest() override {}
 
@@ skipping 458 matching lines @@
       CreateSelectableWindow(gfx::Rect(100, 100, 100, 100)));
   window->SetCapture();
   EXPECT_TRUE(window->HasCapture());
   StartWindowScreenshotSession();
   EXPECT_TRUE(window->HasCapture());
   Cancel();
   EXPECT_FALSE(window->HasCapture());
 }
 
 }  // namespace ash