OLD | NEW |
1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 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 <stdint.h> | 5 #include <stdint.h> |
6 | 6 |
7 #include <memory> | 7 #include <memory> |
8 | 8 |
9 #include "base/bind.h" | 9 #include "base/bind.h" |
10 #include "base/macros.h" | 10 #include "base/macros.h" |
(...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
60 | 60 |
61 std::set<uint32_t> installed_accelerators_; | 61 std::set<uint32_t> installed_accelerators_; |
62 std::unique_ptr<base::RunLoop> run_loop_; | 62 std::unique_ptr<base::RunLoop> run_loop_; |
63 mojo::Binding<AcceleratorHandler> binding_; | 63 mojo::Binding<AcceleratorHandler> binding_; |
64 AcceleratorRegistrarPtr registrar_; | 64 AcceleratorRegistrarPtr registrar_; |
65 bool add_accelerator_result_; | 65 bool add_accelerator_result_; |
66 | 66 |
67 DISALLOW_COPY_AND_ASSIGN(TestAcceleratorHandler); | 67 DISALLOW_COPY_AND_ASSIGN(TestAcceleratorHandler); |
68 }; | 68 }; |
69 | 69 |
70 class AcceleratorRegistrarTest : public shell::test::ServiceTest { | 70 class AcceleratorRegistrarTest : public service_manager::test::ServiceTest { |
71 public: | 71 public: |
72 AcceleratorRegistrarTest() : shell::test::ServiceTest("exe:mash_unittests") {} | 72 AcceleratorRegistrarTest() |
| 73 : service_manager::test::ServiceTest("exe:mash_unittests") {} |
73 ~AcceleratorRegistrarTest() override {} | 74 ~AcceleratorRegistrarTest() override {} |
74 | 75 |
75 protected: | 76 protected: |
76 void ConnectToRegistrar(AcceleratorRegistrarPtr* registrar) { | 77 void ConnectToRegistrar(AcceleratorRegistrarPtr* registrar) { |
77 connector()->ConnectToInterface("service:ash", registrar); | 78 connector()->ConnectToInterface("service:ash", registrar); |
78 } | 79 } |
79 | 80 |
80 private: | 81 private: |
81 DISALLOW_COPY_AND_ASSIGN(AcceleratorRegistrarTest); | 82 DISALLOW_COPY_AND_ASSIGN(AcceleratorRegistrarTest); |
82 }; | 83 }; |
(...skipping 27 matching lines...) Expand all Loading... |
110 3, ui::CreateKeyMatcher(ui::mojom::KeyboardCode::N, | 111 3, ui::CreateKeyMatcher(ui::mojom::KeyboardCode::N, |
111 ui::mojom::kEventFlagShiftDown))); | 112 ui::mojom::kEventFlagShiftDown))); |
112 EXPECT_FALSE(handler_second.AttemptToInstallAccelerator( | 113 EXPECT_FALSE(handler_second.AttemptToInstallAccelerator( |
113 3, ui::CreateKeyMatcher(ui::mojom::KeyboardCode::N, | 114 3, ui::CreateKeyMatcher(ui::mojom::KeyboardCode::N, |
114 ui::mojom::kEventFlagShiftDown))); | 115 ui::mojom::kEventFlagShiftDown))); |
115 */ | 116 */ |
116 } | 117 } |
117 | 118 |
118 } // namespace mus | 119 } // namespace mus |
119 } // namespace ash | 120 } // namespace ash |
OLD | NEW |