Start using display.mojom.Display in mus+ash.

services/ui/test_wm/test_wm.cc

 // Copyright 2016 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 <utility>
+
 #include "mojo/public/c/system/main.h"
 #include "mojo/public/cpp/bindings/binding.h"
 #include "services/shell/public/cpp/application_runner.h"
 #include "services/shell/public/cpp/connector.h"
 #include "services/shell/public/cpp/service.h"
 #include "services/ui/public/cpp/window.h"
 #include "services/ui/public/cpp/window_manager_delegate.h"
 #include "services/ui/public/cpp/window_tree_client.h"
 #include "services/ui/public/cpp/window_tree_client_delegate.h"
 #include "ui/display/display.h"
-#include "ui/display/mojo/display_type_converters.h"
 
 namespace ui {
 namespace test {
 
 class TestWM : public shell::Service,
                public ui::WindowTreeClientDelegate,
                public ui::WindowManagerDelegate {
  public:
   TestWM() {}
   ~TestWM() override { delete window_tree_client_; }
@@ skipping 76 matching lines @@
   DISALLOW_COPY_AND_ASSIGN(TestWM);
 };
 
 }  // namespace test
 }  // namespace ui
 
 MojoResult MojoMain(MojoHandle shell_handle) {
   shell::ApplicationRunner runner(new ui::test::TestWM);
   return runner.Run(shell_handle);
 }