Chromium Code Reviews| Index: mojo/common/test/multiprocess_test_base.h |
| diff --git a/mojo/common/test/multiprocess_test_base.h b/mojo/common/test/multiprocess_test_base.h |
| index 08b66a32c42ca2e13fd2b8b2a4c4b3e11f0c5a3f..58a382b99408aaf9a2d6811446b34888a8416371 100644 |
| --- a/mojo/common/test/multiprocess_test_base.h |
| +++ b/mojo/common/test/multiprocess_test_base.h |
| @@ -36,12 +36,17 @@ class MultiprocessTestBase : public base::MultiProcessTest { |
| // 0-127 being preserved, and -1 being outside the range 0-127. |
| int WaitForChildShutdown(); |
| + // This returns a non-const reference to the scoped pointer, so that tests can |
| + // take ownership if they want. |
| + scoped_ptr<system::PlatformServerChannel>& platform_server_channel() { |
|
darin (slow to review)
2013/12/03 22:36:02
per style guide, shouldn't this be a pointer type?
|
| + return platform_server_channel_; |
| + } |
| + |
| // For use by |MOJO_MULTIPROCESS_TEST_CHILD_MAIN()| only: |
| static void ChildSetup(); |
| - system::PlatformServerChannel* platform_server_channel() { |
| - return platform_server_channel_.get(); |
| - } |
| + // For use in the child process: |
| + static scoped_ptr<system::PlatformClientChannel> platform_client_channel; |
| private: |
| virtual CommandLine MakeCmdLine(const std::string& procname, |