| OLD | NEW |
| 1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "components/mus/public/cpp/tests/window_server_shelltest_base.h" | 5 #include "services/ui/public/cpp/tests/window_server_shelltest_base.h" |
| 6 | 6 |
| 7 #include <memory> | 7 #include <memory> |
| 8 | 8 |
| 9 #include "base/command_line.h" | 9 #include "base/command_line.h" |
| 10 #include "base/macros.h" | 10 #include "base/macros.h" |
| 11 #include "base/memory/ptr_util.h" | 11 #include "base/memory/ptr_util.h" |
| 12 #include "components/mus/common/switches.h" | |
| 13 #include "services/shell/public/cpp/shell_client.h" | 12 #include "services/shell/public/cpp/shell_client.h" |
| 14 #include "services/shell/public/cpp/shell_test.h" | 13 #include "services/shell/public/cpp/shell_test.h" |
| 14 #include "services/ui/common/switches.h" |
| 15 #include "ui/gl/gl_switches.h" | 15 #include "ui/gl/gl_switches.h" |
| 16 | 16 |
| 17 namespace mus { | 17 namespace mus { |
| 18 | 18 |
| 19 namespace { | 19 namespace { |
| 20 | 20 |
| 21 const char kTestAppName[] = "mojo:mus_ws_unittests_app"; | 21 const char kTestAppName[] = "mojo:mus_ws_unittests_app"; |
| 22 | 22 |
| 23 class WindowServerShellTestClient : public shell::test::ShellTestClient { | 23 class WindowServerShellTestClient : public shell::test::ShellTestClient { |
| 24 public: | 24 public: |
| (...skipping 27 matching lines...) Expand all Loading... |
| 52 } | 52 } |
| 53 | 53 |
| 54 WindowServerShellTestBase::~WindowServerShellTestBase() {} | 54 WindowServerShellTestBase::~WindowServerShellTestBase() {} |
| 55 | 55 |
| 56 std::unique_ptr<shell::ShellClient> | 56 std::unique_ptr<shell::ShellClient> |
| 57 WindowServerShellTestBase::CreateShellClient() { | 57 WindowServerShellTestBase::CreateShellClient() { |
| 58 return base::WrapUnique(new WindowServerShellTestClient(this)); | 58 return base::WrapUnique(new WindowServerShellTestClient(this)); |
| 59 } | 59 } |
| 60 | 60 |
| 61 } // namespace mus | 61 } // namespace mus |
| OLD | NEW |