Make PlatformChannelPair "dumb".

mojo/edk/embedder/platform_channel_pair.h

Index: mojo/edk/embedder/platform_channel_pair.h
diff --git a/mojo/edk/embedder/platform_channel_pair.h b/mojo/edk/embedder/platform_channel_pair.h
index d1bdf74887edf935cb43e6a60a69d9c19873603f..c9927e8bf66fee60f8478f6f35387977c6a3d202 100644
--- a/mojo/edk/embedder/platform_channel_pair.h
+++ b/mojo/edk/embedder/platform_channel_pair.h
@@ -5,34 +5,15 @@
 #ifndef MOJO_EDK_EMBEDDER_PLATFORM_CHANNEL_PAIR_H_
 #define MOJO_EDK_EMBEDDER_PLATFORM_CHANNEL_PAIR_H_
 
-#include <string>
-
-#include "base/process/launch.h"
 #include "mojo/edk/platform/scoped_platform_handle.h"
-#include "mojo/public/cpp/system/macros.h"
 
 namespace mojo {
 namespace embedder {
 
-// It would be nice to refactor base/process/launch.h to have a more platform-
-// independent way of representing handles that are passed to child processes.
-using HandlePassingInformation = base::FileHandleMappingVector;
-
-// This is used to create a pair of |PlatformHandle|s that are connected by a
-// suitable (platform-specific) bidirectional "pipe" (e.g., Unix domain socket).
-// The resulting handles can then be used in the same process (e.g., in tests)
-// or between processes. (The "server" handle is the one that will be used in
-// the process that created the pair, whereas the "client" handle is the one
-// that will be used in a different process.)
-//
-// This class provides facilities for passing the client handle to a child
-// process. The parent should call |PrepareToPassClientHandlelToChildProcess()|
-// to get the data needed to do this, spawn the child using that data, and then
-// call |ChildProcessLaunched()|.
-//
-// Note: |PlatformChannelPair()|, |PassClientHandleFromParentProcess()| and
-// |PrepareToPassClientHandleToChildProcess()| have platform-specific
-// implementations.
+// A helper class for creating a pair of |PlatformHandle|s that are connected by
+// a suitable (platform-specific) bidirectional "pipe" (e.g., Unix domain
+// socket). The resulting handles can then be used in the same process (e.g., in
+// tests) or between processes.
 //
 // Note: On POSIX platforms, to write to the "pipe", use
 // |PlatformChannel{Write,Writev}()| (from platform_channel_utils.h) instead of
@@ -43,40 +24,8 @@ class PlatformChannelPair {
   PlatformChannelPair();
   ~PlatformChannelPair();
 
-  platform::ScopedPlatformHandle PassServerHandle();
-
-  // For in-process use (e.g., in tests or to pass over another channel).
-  platform::ScopedPlatformHandle PassClientHandle();
-
-  // To be called in the child process, after the parent process called
-  // |PrepareToPassClientHandleToChildProcess()| and launched the child (using
-  // the provided data), to create a client handle connected to the server
-  // handle (in the parent process). |string_from_parent| should be the string
-  // that was produced (in the parent process) by
-  // |PrepareToPassClientHandleToChildProcess()|.
-  static platform::ScopedPlatformHandle PassClientHandleFromParentProcess(
-      const std::string& string_from_parent);
-
-  // Prepares to pass the client channel to a new child process, to be launched
-  // using |LaunchProcess()| (from base/launch.h). |*string_for_child| will be
-  // set to a string that should be passed to the child process and which should
-  // be given (in the child ) to |PassClientHandleFromParentProcess()|. Also
-  // modifies |*handle_passing_info| as needed.
-  void PrepareToPassClientHandleToChildProcess(
-      std::string* string_for_child,
-      HandlePassingInformation* handle_passing_info) const;
-
-  // To be called once the child process has been successfully launched, to do
-  // any cleanup necessary.
-  void ChildProcessLaunched();
-
- private:
-  static const char kMojoPlatformChannelHandleSwitch[];
-
-  platform::ScopedPlatformHandle server_handle_;
-  platform::ScopedPlatformHandle client_handle_;
-
-  MOJO_DISALLOW_COPY_AND_ASSIGN(PlatformChannelPair);
+  platform::ScopedPlatformHandle handle0;
+  platform::ScopedPlatformHandle handle1;
 };
 
 }  // namespace embedder