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..c983df23ee71c77a053ce31b61c0e83e1a08aeb0 100644 |
--- a/mojo/common/test/multiprocess_test_base.h |
+++ b/mojo/common/test/multiprocess_test_base.h |
@@ -39,9 +39,11 @@ class MultiprocessTestBase : public base::MultiProcessTest { |
// 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 main process: |
+ scoped_ptr<system::PlatformServerChannel> platform_server_channel; |
+ |
+ // For use (and only valid) in the child process: |
+ static scoped_ptr<system::PlatformClientChannel> platform_client_channel; |
private: |
virtual CommandLine MakeCmdLine(const std::string& procname, |
@@ -50,8 +52,6 @@ class MultiprocessTestBase : public base::MultiProcessTest { |
// Valid after |StartChild()| and before |WaitForChildShutdown()|. |
base::ProcessHandle test_child_handle_; |
- scoped_ptr<system::PlatformServerChannel> platform_server_channel_; |
- |
DISALLOW_COPY_AND_ASSIGN(MultiprocessTestBase); |
}; |