OLD | NEW |
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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 // Note: This file also tests child_process.*. | 5 // Note: This file also tests child_process.*. |
6 | 6 |
7 #include "mojo/runner/child_process_host.h" | 7 #include "mojo/runner/child_process_host.h" |
8 | 8 |
9 #include "base/logging.h" | 9 #include "base/logging.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/path_service.h" |
12 #include "mojo/message_pump/message_pump_mojo.h" | 13 #include "mojo/message_pump/message_pump_mojo.h" |
13 #include "mojo/runner/context.h" | 14 #include "mojo/runner/context.h" |
14 #include "testing/gtest/include/gtest/gtest.h" | 15 #include "testing/gtest/include/gtest/gtest.h" |
15 | 16 |
16 namespace mojo { | 17 namespace mojo { |
17 namespace runner { | 18 namespace runner { |
18 namespace { | 19 namespace { |
19 | 20 |
20 // Subclass just so we can observe |DidStart()|. | 21 // Subclass just so we can observe |DidStart()|. |
21 class TestChildProcessHost : public ChildProcessHost { | 22 class TestChildProcessHost : public ChildProcessHost { |
(...skipping 14 matching lines...) Expand all Loading... |
36 | 37 |
37 #if defined(OS_ANDROID) | 38 #if defined(OS_ANDROID) |
38 // TODO(qsr): Multiprocess shell tests are not supported on android. | 39 // TODO(qsr): Multiprocess shell tests are not supported on android. |
39 #define MAYBE_StartJoin DISABLED_StartJoin | 40 #define MAYBE_StartJoin DISABLED_StartJoin |
40 #else | 41 #else |
41 #define MAYBE_StartJoin StartJoin | 42 #define MAYBE_StartJoin StartJoin |
42 #endif // defined(OS_ANDROID) | 43 #endif // defined(OS_ANDROID) |
43 // Just tests starting the child process and joining it (without starting an | 44 // Just tests starting the child process and joining it (without starting an |
44 // app). | 45 // app). |
45 TEST(ChildProcessHostTest, MAYBE_StartJoin) { | 46 TEST(ChildProcessHostTest, MAYBE_StartJoin) { |
46 Context context; | 47 base::FilePath shell_dir; |
| 48 PathService::Get(base::DIR_MODULE, &shell_dir); |
| 49 Context context(shell_dir); |
47 base::MessageLoop message_loop( | 50 base::MessageLoop message_loop( |
48 scoped_ptr<base::MessagePump>(new common::MessagePumpMojo())); | 51 scoped_ptr<base::MessagePump>(new common::MessagePumpMojo())); |
49 context.Init(); | 52 context.Init(); |
50 TestChildProcessHost child_process_host(&context); | 53 TestChildProcessHost child_process_host(&context); |
51 child_process_host.Start(); | 54 child_process_host.Start(); |
52 message_loop.Run(); | 55 message_loop.Run(); |
53 child_process_host.ExitNow(123); | 56 child_process_host.ExitNow(123); |
54 int exit_code = child_process_host.Join(); | 57 int exit_code = child_process_host.Join(); |
55 VLOG(2) << "Joined child: exit_code = " << exit_code; | 58 VLOG(2) << "Joined child: exit_code = " << exit_code; |
56 EXPECT_EQ(123, exit_code); | 59 EXPECT_EQ(123, exit_code); |
57 | 60 |
58 context.Shutdown(); | 61 context.Shutdown(); |
59 } | 62 } |
60 | 63 |
61 } // namespace | 64 } // namespace |
62 } // namespace runner | 65 } // namespace runner |
63 } // namespace mojo | 66 } // namespace mojo |
OLD | NEW |