Remove SimpleBroker and instead use the production broker implementation in tests.

mojo/edk/test/multiprocess_test_helper.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "mojo/edk/test/multiprocess_test_helper.h"
 
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/process/kill.h"
 #include "base/process/process_handle.h"
 #include "build/build_config.h"
+#include "mojo/edk/embedder/embedder.h"
 #include "mojo/edk/embedder/platform_channel_pair.h"
 
 #if defined(OS_WIN)
 #include "base/win/windows_version.h"
 #endif
 
 namespace mojo {
 namespace edk {
 namespace test {
 
+const char kBrokerHandleSwitch[] = "broker-handle";
+
 MultiprocessTestHelper::MultiprocessTestHelper() {
   platform_channel_pair_.reset(new PlatformChannelPair());
   server_platform_handle = platform_channel_pair_->PassServerHandle();
+  broker_platform_channel_pair_.reset(new PlatformChannelPair());
 }
 
 MultiprocessTestHelper::~MultiprocessTestHelper() {
   CHECK(!test_child_.IsValid());
   server_platform_handle.reset();
   platform_channel_pair_.reset();
 }
 
 void MultiprocessTestHelper::StartChild(const std::string& test_child_name) {
   StartChildWithExtraSwitch(test_child_name, std::string(), std::string());
 }
 
 void MultiprocessTestHelper::StartChildWithExtraSwitch(
     const std::string& test_child_name,
     const std::string& switch_string,
     const std::string& switch_value) {
   CHECK(platform_channel_pair_);
   CHECK(!test_child_name.empty());
   CHECK(!test_child_.IsValid());
 
   std::string test_child_main = test_child_name + "TestChildMain";
 
   base::CommandLine command_line(
       base::GetMultiProcessTestChildBaseCommandLine());
   HandlePassingInformation handle_passing_info;
   platform_channel_pair_->PrepareToPassClientHandleToChildProcess(
       &command_line, &handle_passing_info);
 
+  std::string broker_handle = broker_platform_channel_pair_->
+      PrepareToPassClientHandleToChildProcessAsString(&handle_passing_info);
+  command_line.AppendSwitchASCII(kBrokerHandleSwitch, broker_handle);
+
   if (!switch_string.empty()) {
     CHECK(!command_line.HasSwitch(switch_string));
     if (!switch_value.empty())
       command_line.AppendSwitchASCII(switch_string, switch_value);
     else
       command_line.AppendSwitch(switch_string);
   }
 
   base::LaunchOptions options;
 #if defined(OS_POSIX)
   options.fds_to_remap = &handle_passing_info;
 #elif defined(OS_WIN)
   options.start_hidden = true;
   if (base::win::GetVersion() >= base::win::VERSION_VISTA)
     options.handles_to_inherit = &handle_passing_info;
   else
     options.inherit_handles = true;
 #else
 #error "Not supported yet."
 #endif
 
   test_child_ =
       base::SpawnMultiProcessTestChild(test_child_main, command_line, options);
   platform_channel_pair_->ChildProcessLaunched();
 
+  broker_platform_channel_pair_->ChildProcessLaunched();
+  ChildProcessLaunched(test_child_.Handle(),
+                       broker_platform_channel_pair_->PassServerHandle());
+
   CHECK(test_child_.IsValid());
 }
 
 int MultiprocessTestHelper::WaitForChildShutdown() {
   CHECK(test_child_.IsValid());
 
   int rv = -1;
   CHECK(
       test_child_.WaitForExitWithTimeout(TestTimeouts::action_timeout(), &rv));
   test_child_.Close();
   return rv;
 }
 
 bool MultiprocessTestHelper::WaitForChildTestShutdown() {
   return WaitForChildShutdown() == 0;
 }
 
 // static
 void MultiprocessTestHelper::ChildSetup() {
   CHECK(base::CommandLine::InitializedForCurrentProcess());
   client_platform_handle =
       PlatformChannelPair::PassClientHandleFromParentProcess(
           *base::CommandLine::ForCurrentProcess());
+
+  std::string broker_handle_str =
+      base::CommandLine::ForCurrentProcess()->GetSwitchValueASCII(
+          kBrokerHandleSwitch);
+  ScopedPlatformHandle broker_handle =
+      PlatformChannelPair::PassClientHandleFromParentProcessFromString(
+          broker_handle_str);
+  SetParentPipeHandle(broker_handle.Pass());
 }
 
 // static
 ScopedPlatformHandle MultiprocessTestHelper::client_platform_handle;
 
 }  // namespace test
 }  // namespace edk
 }  // namespace mojo