| 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 "mojo/shell/runner/child/test_native_main.h" | 5 #include "mojo/shell/runner/child/test_native_main.h" |
| 6 | 6 |
| 7 #include <utility> | 7 #include <utility> |
| 8 | 8 |
| 9 #include "base/debug/stack_trace.h" | 9 #include "base/debug/stack_trace.h" |
| 10 #include "base/macros.h" | 10 #include "base/macros.h" |
| 11 #include "base/message_loop/message_loop.h" | 11 #include "base/message_loop/message_loop.h" |
| 12 #include "base/process/launch.h" | 12 #include "base/process/launch.h" |
| 13 #include "base/threading/thread.h" | 13 #include "base/threading/thread.h" |
| 14 #include "build/build_config.h" | 14 #include "build/build_config.h" |
| 15 #include "mojo/message_pump/message_pump_mojo.h" | 15 #include "mojo/message_pump/message_pump_mojo.h" |
| 16 #include "mojo/shell/public/cpp/application_delegate.h" | |
| 17 #include "mojo/shell/public/cpp/application_impl.h" | 16 #include "mojo/shell/public/cpp/application_impl.h" |
| 17 #include "mojo/shell/public/cpp/shell_client.h" |
| 18 #include "mojo/shell/runner/child/runner_connection.h" | 18 #include "mojo/shell/runner/child/runner_connection.h" |
| 19 #include "mojo/shell/runner/init.h" | 19 #include "mojo/shell/runner/init.h" |
| 20 #include "third_party/mojo/src/mojo/edk/embedder/embedder.h" | 20 #include "third_party/mojo/src/mojo/edk/embedder/embedder.h" |
| 21 #include "third_party/mojo/src/mojo/edk/embedder/process_delegate.h" | 21 #include "third_party/mojo/src/mojo/edk/embedder/process_delegate.h" |
| 22 | 22 |
| 23 namespace mojo { | 23 namespace mojo { |
| 24 namespace shell { | 24 namespace shell { |
| 25 namespace { | 25 namespace { |
| 26 | 26 |
| 27 class ProcessDelegate : public mojo::embedder::ProcessDelegate { | 27 class ProcessDelegate : public mojo::embedder::ProcessDelegate { |
| 28 public: | 28 public: |
| 29 ProcessDelegate() {} | 29 ProcessDelegate() {} |
| 30 ~ProcessDelegate() override {} | 30 ~ProcessDelegate() override {} |
| 31 | 31 |
| 32 private: | 32 private: |
| 33 void OnShutdownComplete() override {} | 33 void OnShutdownComplete() override {} |
| 34 | 34 |
| 35 DISALLOW_COPY_AND_ASSIGN(ProcessDelegate); | 35 DISALLOW_COPY_AND_ASSIGN(ProcessDelegate); |
| 36 }; | 36 }; |
| 37 | 37 |
| 38 } // namespace | 38 } // namespace |
| 39 | 39 |
| 40 int TestNativeMain(mojo::ApplicationDelegate* application_delegate) { | 40 int TestNativeMain(mojo::ShellClient* application_delegate) { |
| 41 mojo::shell::WaitForDebuggerIfNecessary(); | 41 mojo::shell::WaitForDebuggerIfNecessary(); |
| 42 | 42 |
| 43 #if !defined(OFFICIAL_BUILD) | 43 #if !defined(OFFICIAL_BUILD) |
| 44 base::debug::EnableInProcessStackDumping(); | 44 base::debug::EnableInProcessStackDumping(); |
| 45 #if defined(OS_WIN) | 45 #if defined(OS_WIN) |
| 46 base::RouteStdioToConsole(false); | 46 base::RouteStdioToConsole(false); |
| 47 #endif | 47 #endif |
| 48 #endif | 48 #endif |
| 49 | 49 |
| 50 { | 50 { |
| (...skipping 19 matching lines...) Expand all Loading... |
| 70 loop.Run(); | 70 loop.Run(); |
| 71 | 71 |
| 72 mojo::embedder::ShutdownIPCSupport(); | 72 mojo::embedder::ShutdownIPCSupport(); |
| 73 } | 73 } |
| 74 | 74 |
| 75 return 0; | 75 return 0; |
| 76 } | 76 } |
| 77 | 77 |
| 78 } // namespace shell | 78 } // namespace shell |
| 79 } // namespace mojo | 79 } // namespace mojo |
| OLD | NEW |