mojo/converters/ime,display -> ui/platform_window,display/mojo

components/mus/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 "components/mus/public/cpp/window.h"
 #include "components/mus/public/cpp/window_manager_delegate.h"
 #include "components/mus/public/cpp/window_tree_connection.h"
 #include "components/mus/public/cpp/window_tree_delegate.h"
 #include "components/mus/public/interfaces/window_manager_factory.mojom.h"
 #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/shell_client.h"
 #include "ui/display/display.h"
+#include "ui/display/mojo/display_type_converters.h"
 #include "ui/gfx/geometry/mojo/geometry_type_converters.h"
-#include "ui/mojo/display/display_type_converters.h"
 
 namespace mus {
 namespace test {
 
 class TestWM : public shell::ShellClient,
                public mus::mojom::WindowManagerFactory,
                public mus::WindowTreeDelegate,
                public mus::WindowManagerDelegate {
  public:
   TestWM() : window_manager_factory_binding_(this) {}
@@ skipping 78 matching lines @@
   DISALLOW_COPY_AND_ASSIGN(TestWM);
 };
 
 }  // namespace test
 }  // namespace mus
 
 MojoResult MojoMain(MojoHandle shell_handle) {
   shell::ApplicationRunner runner(new mus::test::TestWM);
   return runner.Run(shell_handle);
 }