| Index: ui/aura/test/mus/test_window_tree_client_setup.h
|
| diff --git a/services/ui/public/cpp/tests/test_window_tree_client_setup.h b/ui/aura/test/mus/test_window_tree_client_setup.h
|
| similarity index 85%
|
| copy from services/ui/public/cpp/tests/test_window_tree_client_setup.h
|
| copy to ui/aura/test/mus/test_window_tree_client_setup.h
|
| index e7146f9a45372a34de12ad6483bfd4bcad313e47..50fa5147449b47183e5d4d120fdc053589a81590 100644
|
| --- a/services/ui/public/cpp/tests/test_window_tree_client_setup.h
|
| +++ b/ui/aura/test/mus/test_window_tree_client_setup.h
|
| @@ -2,8 +2,8 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#ifndef SERVICES_UI_PUBLIC_CPP_TESTS_TEST_WINDOW_TREE_CLIENT_SETUP_H_
|
| -#define SERVICES_UI_PUBLIC_CPP_TESTS_TEST_WINDOW_TREE_CLIENT_SETUP_H_
|
| +#ifndef UI_AURA_TEST_MUS_TEST_WINDOW_TREE_CLIENT_SETUP_H_
|
| +#define UI_AURA_TEST_MUS_TEST_WINDOW_TREE_CLIENT_SETUP_H_
|
|
|
| #include <memory>
|
|
|
| @@ -13,7 +13,7 @@ namespace display {
|
| class Display;
|
| }
|
|
|
| -namespace ui {
|
| +namespace aura {
|
|
|
| class TestWindowTree;
|
| class WindowManagerDelegate;
|
| @@ -52,6 +52,6 @@ class TestWindowTreeClientSetup {
|
| DISALLOW_COPY_AND_ASSIGN(TestWindowTreeClientSetup);
|
| };
|
|
|
| -} // namespace ui
|
| +} // namespace aura
|
|
|
| -#endif // SERVICES_UI_PUBLIC_CPP_TESTS_TEST_WINDOW_TREE_CLIENT_SETUP_H_
|
| +#endif // UI_AURA_TEST_MUS_TEST_WINDOW_TREE_CLIENT_SETUP_H_
|
|
|