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

Side by Side Diff: services/service_manager/tests/connect/connect_test_driver.cc

Issue 2420253002: Rename shell namespace to service_manager (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 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 <memory> 5 #include <memory>
6 6
7 #include "base/at_exit.h" 7 #include "base/at_exit.h"
8 #include "base/command_line.h" 8 #include "base/command_line.h"
9 #include "base/macros.h" 9 #include "base/macros.h"
10 #include "base/process/process.h" 10 #include "base/process/process.h"
11 #include "mojo/public/cpp/bindings/binding_set.h" 11 #include "mojo/public/cpp/bindings/binding_set.h"
12 #include "services/service_manager/public/cpp/connection.h" 12 #include "services/service_manager/public/cpp/connection.h"
13 #include "services/service_manager/public/cpp/connector.h" 13 #include "services/service_manager/public/cpp/connector.h"
14 #include "services/service_manager/public/cpp/service.h" 14 #include "services/service_manager/public/cpp/service.h"
15 #include "services/service_manager/runner/child/test_native_main.h" 15 #include "services/service_manager/runner/child/test_native_main.h"
16 #include "services/service_manager/runner/init.h" 16 #include "services/service_manager/runner/init.h"
17 #include "services/service_manager/tests/connect/connect_test.mojom.h" 17 #include "services/service_manager/tests/connect/connect_test.mojom.h"
18 #include "services/service_manager/tests/util.h" 18 #include "services/service_manager/tests/util.h"
19 19
20 using shell::test::mojom::ClientProcessTest; 20 using service_manager::test::mojom::ClientProcessTest;
21 using shell::test::mojom::ClientProcessTestRequest; 21 using service_manager::test::mojom::ClientProcessTestRequest;
22 22
23 namespace { 23 namespace {
24 24
25 class Driver : public shell::Service, 25 class Driver : public service_manager::Service,
26 public shell::InterfaceFactory<ClientProcessTest>, 26 public service_manager::InterfaceFactory<ClientProcessTest>,
27 public ClientProcessTest { 27 public ClientProcessTest {
28 public: 28 public:
29 Driver() {} 29 Driver() {}
30 ~Driver() override {} 30 ~Driver() override {}
31 31
32 private: 32 private:
33 // shell::Service: 33 // service_manager::Service:
34 bool OnConnect(const shell::Identity& remote_identity, 34 bool OnConnect(const service_manager::Identity& remote_identity,
35 shell::InterfaceRegistry* registry) override { 35 service_manager::InterfaceRegistry* registry) override {
36 registry->AddInterface<ClientProcessTest>(this); 36 registry->AddInterface<ClientProcessTest>(this);
37 return true; 37 return true;
38 } 38 }
39 bool OnStop() override { 39 bool OnStop() override {
40 // TODO(rockot): http://crbug.com/596621. Should be able to remove this 40 // TODO(rockot): http://crbug.com/596621. Should be able to remove this
41 // override entirely. 41 // override entirely.
42 _exit(1); 42 _exit(1);
43 } 43 }
44 44
45 // shell::InterfaceFactory<ConnectTestService>: 45 // service_manager::InterfaceFactory<ConnectTestService>:
46 void Create(const shell::Identity& remote_identity, 46 void Create(const service_manager::Identity& remote_identity,
47 ClientProcessTestRequest request) override { 47 ClientProcessTestRequest request) override {
48 bindings_.AddBinding(this, std::move(request)); 48 bindings_.AddBinding(this, std::move(request));
49 } 49 }
50 50
51 // test::mojom::ClientProcessTest: 51 // test::mojom::ClientProcessTest:
52 void LaunchAndConnectToProcess( 52 void LaunchAndConnectToProcess(
53 const LaunchAndConnectToProcessCallback& callback) override { 53 const LaunchAndConnectToProcessCallback& callback) override {
54 base::Process process; 54 base::Process process;
55 std::unique_ptr<shell::Connection> connection = 55 std::unique_ptr<service_manager::Connection> connection =
56 shell::test::LaunchAndConnectToProcess( 56 service_manager::test::LaunchAndConnectToProcess(
57 #if defined(OS_WIN) 57 #if defined(OS_WIN)
58 "connect_test_exe.exe", 58 "connect_test_exe.exe",
59 #else 59 #else
60 "connect_test_exe", 60 "connect_test_exe",
61 #endif 61 #endif
62 shell::Identity("exe:connect_test_exe", 62 service_manager::Identity("exe:connect_test_exe",
63 shell::mojom::kInheritUserID), 63 service_manager::mojom::kInheritUserID),
64 connector(), &process); 64 connector(), &process);
65 callback.Run(static_cast<int32_t>(connection->GetResult()), 65 callback.Run(static_cast<int32_t>(connection->GetResult()),
66 connection->GetRemoteIdentity()); 66 connection->GetRemoteIdentity());
67 } 67 }
68 68
69 mojo::BindingSet<ClientProcessTest> bindings_; 69 mojo::BindingSet<ClientProcessTest> bindings_;
70 70
71 DISALLOW_COPY_AND_ASSIGN(Driver); 71 DISALLOW_COPY_AND_ASSIGN(Driver);
72 }; 72 };
73 73
74 } // namespace 74 } // namespace
75 75
76 int main(int argc, char** argv) { 76 int main(int argc, char** argv) {
77 base::AtExitManager at_exit; 77 base::AtExitManager at_exit;
78 base::CommandLine::Init(argc, argv); 78 base::CommandLine::Init(argc, argv);
79 79
80 shell::InitializeLogging(); 80 service_manager::InitializeLogging();
81 81
82 Driver driver; 82 Driver driver;
83 return shell::TestNativeMain(&driver); 83 return service_manager::TestNativeMain(&driver);
84 } 84 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698