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

Side by Side Diff: mojo/edk/test/multiprocess_test_helper.cc

Issue 782693004: Update mojo sdk to rev f6c8ec07c01deebc13178d516225fd12695c3dc2 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: hack mojo_system_impl gypi for android :| Created 6 years 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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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/edk/test/multiprocess_test_helper.h" 5 #include "mojo/edk/test/multiprocess_test_helper.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/logging.h" 8 #include "base/logging.h"
9 #include "base/process/kill.h" 9 #include "base/process/kill.h"
10 #include "base/process/process_handle.h" 10 #include "base/process/process_handle.h"
11 #include "build/build_config.h" 11 #include "build/build_config.h"
12 #include "mojo/edk/embedder/platform_channel_pair.h" 12 #include "mojo/edk/embedder/platform_channel_pair.h"
13 13
14 namespace mojo { 14 namespace mojo {
15 namespace test { 15 namespace test {
16 16
17 MultiprocessTestHelper::MultiprocessTestHelper() 17 MultiprocessTestHelper::MultiprocessTestHelper()
18 : test_child_handle_(base::kNullProcessHandle) { 18 : test_child_handle_(base::kNullProcessHandle) {
19 platform_channel_pair_.reset(new embedder::PlatformChannelPair()); 19 platform_channel_pair_.reset(new embedder::PlatformChannelPair());
20 server_platform_handle = platform_channel_pair_->PassServerHandle(); 20 server_platform_handle = platform_channel_pair_->PassServerHandle();
21 } 21 }
22 22
23 MultiprocessTestHelper::~MultiprocessTestHelper() { 23 MultiprocessTestHelper::~MultiprocessTestHelper() {
24 CHECK_EQ(test_child_handle_, base::kNullProcessHandle); 24 CHECK_EQ(test_child_handle_, base::kNullProcessHandle);
25 server_platform_handle.reset(); 25 server_platform_handle.reset();
26 platform_channel_pair_.reset(); 26 platform_channel_pair_.reset();
27 } 27 }
28 28
29 void MultiprocessTestHelper::StartChild(const std::string& test_child_name) { 29 void MultiprocessTestHelper::StartChild(const std::string& test_child_name) {
30 CHECK(platform_channel_pair_.get()); 30 CHECK(platform_channel_pair_);
31 CHECK(!test_child_name.empty()); 31 CHECK(!test_child_name.empty());
32 CHECK_EQ(test_child_handle_, base::kNullProcessHandle); 32 CHECK_EQ(test_child_handle_, base::kNullProcessHandle);
33 33
34 std::string test_child_main = test_child_name + "TestChildMain"; 34 std::string test_child_main = test_child_name + "TestChildMain";
35 35
36 base::CommandLine command_line( 36 base::CommandLine command_line(
37 base::GetMultiProcessTestChildBaseCommandLine()); 37 base::GetMultiProcessTestChildBaseCommandLine());
38 embedder::HandlePassingInformation handle_passing_info; 38 embedder::HandlePassingInformation handle_passing_info;
39 platform_channel_pair_->PrepareToPassClientHandleToChildProcess( 39 platform_channel_pair_->PrepareToPassClientHandleToChildProcess(
40 &command_line, &handle_passing_info); 40 &command_line, &handle_passing_info);
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
77 client_platform_handle = 77 client_platform_handle =
78 embedder::PlatformChannelPair::PassClientHandleFromParentProcess( 78 embedder::PlatformChannelPair::PassClientHandleFromParentProcess(
79 *base::CommandLine::ForCurrentProcess()); 79 *base::CommandLine::ForCurrentProcess());
80 } 80 }
81 81
82 // static 82 // static
83 embedder::ScopedPlatformHandle MultiprocessTestHelper::client_platform_handle; 83 embedder::ScopedPlatformHandle MultiprocessTestHelper::client_platform_handle;
84 84
85 } // namespace test 85 } // namespace test
86 } // namespace mojo 86 } // namespace mojo
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698