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

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

Issue 1350503004: Some easy conversions of scoped_ptr -> std::unique_ptr in the EDK. (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: Created 5 years, 3 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
« no previous file with comments | « mojo/edk/test/multiprocess_test_helper.h ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 "mojo/edk/embedder/platform_channel_pair.h" 9 #include "mojo/edk/embedder/platform_channel_pair.h"
10 10
11 namespace mojo { 11 namespace mojo {
12 namespace test { 12 namespace test {
13 13
14 MultiprocessTestHelper::MultiprocessTestHelper() { 14 MultiprocessTestHelper::MultiprocessTestHelper()
15 platform_channel_pair_.reset(new embedder::PlatformChannelPair()); 15 : platform_channel_pair_(new embedder::PlatformChannelPair()) {
16 server_platform_handle = platform_channel_pair_->PassServerHandle(); 16 server_platform_handle = platform_channel_pair_->PassServerHandle();
17 } 17 }
18 18
19 MultiprocessTestHelper::~MultiprocessTestHelper() { 19 MultiprocessTestHelper::~MultiprocessTestHelper() {
20 CHECK(!test_child_.IsValid()); 20 CHECK(!test_child_.IsValid());
21 server_platform_handle.reset(); 21 server_platform_handle.reset();
22 platform_channel_pair_.reset(); 22 platform_channel_pair_.reset();
23 } 23 }
24 24
25 void MultiprocessTestHelper::StartChild(const std::string& test_child_name) { 25 void MultiprocessTestHelper::StartChild(const std::string& test_child_name) {
(...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after
80 client_platform_handle = 80 client_platform_handle =
81 embedder::PlatformChannelPair::PassClientHandleFromParentProcess( 81 embedder::PlatformChannelPair::PassClientHandleFromParentProcess(
82 *base::CommandLine::ForCurrentProcess()); 82 *base::CommandLine::ForCurrentProcess());
83 } 83 }
84 84
85 // static 85 // static
86 embedder::ScopedPlatformHandle MultiprocessTestHelper::client_platform_handle; 86 embedder::ScopedPlatformHandle MultiprocessTestHelper::client_platform_handle;
87 87
88 } // namespace test 88 } // namespace test
89 } // namespace mojo 89 } // namespace mojo
OLDNEW
« no previous file with comments | « mojo/edk/test/multiprocess_test_helper.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698