| 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 "base/at_exit.h" | 5 #include "base/at_exit.h" |
| 6 #include "base/command_line.h" | 6 #include "base/command_line.h" |
| 7 #include "mojo/application/public/cpp/application_connection.h" | 7 #include "mojo/application/public/cpp/application_connection.h" |
| 8 #include "mojo/application/public/cpp/application_delegate.h" | 8 #include "mojo/application/public/cpp/application_delegate.h" |
| 9 #include "mojo/application/public/cpp/application_impl.h" | 9 #include "mojo/application/public/cpp/application_impl.h" |
| 10 #include "mojo/converters/network/network_type_converters.h" | |
| 11 #include "mojo/runner/child/test_native_main.h" | 10 #include "mojo/runner/child/test_native_main.h" |
| 12 #include "mojo/runner/init.h" | 11 #include "mojo/runner/init.h" |
| 13 #include "mojo/shell/application_manager_apptests.mojom.h" | 12 #include "mojo/shell/application_manager_apptests.mojom.h" |
| 14 | 13 |
| 15 using mojo::shell::test::mojom::CreateInstanceForHandleTestPtr; | 14 using mojo::shell::test::mojom::CreateInstanceForHandleTestPtr; |
| 16 | 15 |
| 17 namespace { | 16 namespace { |
| 18 | 17 |
| 19 class TargetApplicationDelegate : public mojo::ApplicationDelegate { | 18 class TargetApplicationDelegate : public mojo::ApplicationDelegate { |
| 20 public: | 19 public: |
| 21 TargetApplicationDelegate() {} | 20 TargetApplicationDelegate() {} |
| 22 ~TargetApplicationDelegate() override {} | 21 ~TargetApplicationDelegate() override {} |
| 23 | 22 |
| 24 private: | 23 private: |
| 25 // mojo::ApplicationDelegate: | 24 // mojo::ApplicationDelegate: |
| 26 void Initialize(mojo::ApplicationImpl* app) override { | 25 void Initialize(mojo::ApplicationImpl* app) override { |
| 27 CreateInstanceForHandleTestPtr service; | 26 CreateInstanceForHandleTestPtr service; |
| 28 mojo::ApplicationImpl::ConnectParams params( | 27 app->ConnectToService("mojo:mojo_shell_apptests", &service); |
| 29 std::string("mojo:mojo_shell_apptests")); | |
| 30 app->ConnectToService(¶ms, &service); | |
| 31 service->Ping("From Target"); | 28 service->Ping("From Target"); |
| 32 } | 29 } |
| 33 bool ConfigureIncomingConnection( | 30 bool ConfigureIncomingConnection( |
| 34 mojo::ApplicationConnection* connection) override { | 31 mojo::ApplicationConnection* connection) override { |
| 35 return true; | 32 return true; |
| 36 } | 33 } |
| 37 | 34 |
| 38 DISALLOW_COPY_AND_ASSIGN(TargetApplicationDelegate); | 35 DISALLOW_COPY_AND_ASSIGN(TargetApplicationDelegate); |
| 39 }; | 36 }; |
| 40 | 37 |
| 41 } // namespace | 38 } // namespace |
| 42 | 39 |
| 43 int main(int argc, char** argv) { | 40 int main(int argc, char** argv) { |
| 44 base::AtExitManager at_exit; | 41 base::AtExitManager at_exit; |
| 45 base::CommandLine::Init(argc, argv); | 42 base::CommandLine::Init(argc, argv); |
| 46 | 43 |
| 47 mojo::runner::InitializeLogging(); | 44 mojo::runner::InitializeLogging(); |
| 48 | 45 |
| 49 TargetApplicationDelegate delegate; | 46 TargetApplicationDelegate delegate; |
| 50 return mojo::runner::TestNativeMain(&delegate); | 47 return mojo::runner::TestNativeMain(&delegate); |
| 51 } | 48 } |
| OLD | NEW |