Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(290)

Side by Side Diff: ash/mus/accelerators/accelerator_registrar_unittest.cc

Issue 2390013002: Rename mojo: to service: (Closed)
Patch Set: . Created 4 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 56 matching lines...) Expand 10 before | Expand all | Expand 10 after
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 shell::test::ServiceTest {
71 public: 71 public:
72 AcceleratorRegistrarTest() : shell::test::ServiceTest("exe:mash_unittests") {} 72 AcceleratorRegistrarTest() : shell::test::ServiceTest("exe:mash_unittests") {}
73 ~AcceleratorRegistrarTest() override {} 73 ~AcceleratorRegistrarTest() override {}
74 74
75 protected: 75 protected:
76 void ConnectToRegistrar(AcceleratorRegistrarPtr* registrar) { 76 void ConnectToRegistrar(AcceleratorRegistrarPtr* registrar) {
77 connector()->ConnectToInterface("mojo:ash", registrar); 77 connector()->ConnectToInterface("service:ash", registrar);
78 } 78 }
79 79
80 private: 80 private:
81 DISALLOW_COPY_AND_ASSIGN(AcceleratorRegistrarTest); 81 DISALLOW_COPY_AND_ASSIGN(AcceleratorRegistrarTest);
82 }; 82 };
83 83
84 TEST_F(AcceleratorRegistrarTest, AcceleratorRegistrarBasic) { 84 TEST_F(AcceleratorRegistrarTest, AcceleratorRegistrarBasic) {
85 AcceleratorRegistrarPtr registrar_first; 85 AcceleratorRegistrarPtr registrar_first;
86 ConnectToRegistrar(&registrar_first); 86 ConnectToRegistrar(&registrar_first);
87 TestAcceleratorHandler handler_first(std::move(registrar_first)); 87 TestAcceleratorHandler handler_first(std::move(registrar_first));
(...skipping 22 matching lines...) Expand all
110 3, ui::CreateKeyMatcher(ui::mojom::KeyboardCode::N, 110 3, ui::CreateKeyMatcher(ui::mojom::KeyboardCode::N,
111 ui::mojom::kEventFlagShiftDown))); 111 ui::mojom::kEventFlagShiftDown)));
112 EXPECT_FALSE(handler_second.AttemptToInstallAccelerator( 112 EXPECT_FALSE(handler_second.AttemptToInstallAccelerator(
113 3, ui::CreateKeyMatcher(ui::mojom::KeyboardCode::N, 113 3, ui::CreateKeyMatcher(ui::mojom::KeyboardCode::N,
114 ui::mojom::kEventFlagShiftDown))); 114 ui::mojom::kEventFlagShiftDown)));
115 */ 115 */
116 } 116 }
117 117
118 } // namespace mus 118 } // namespace mus
119 } // namespace ash 119 } // namespace ash
OLDNEW
« no previous file with comments | « ash/mus/accelerators/accelerator_controller_delegate_mus.cc ('k') | ash/mus/accessibility_delegate_mus.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698