Revert "Update mojo sdk to rev 1dc8a9a5db73d3718d99917fadf31f5fb2ebad4f"

third_party/mojo/src/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/platform_channel_pair.h"
 
 namespace mojo {
 namespace test {
 
 MultiprocessTestHelper::MultiprocessTestHelper() {
   platform_channel_pair_.reset(new embedder::PlatformChannelPair());
   server_platform_handle = platform_channel_pair_->PassServerHandle();
 }
 
 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());
   embedder::HandlePassingInformation handle_passing_info;
   platform_channel_pair_->PrepareToPassClientHandleToChildProcess(
       &command_line, &handle_passing_info);
 
-  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;
   options.handles_to_inherit = &handle_passing_info;
 #else
 #error "Not supported yet."
 #endif
 
@@ skipping 24 matching lines @@
   client_platform_handle =
       embedder::PlatformChannelPair::PassClientHandleFromParentProcess(
           *base::CommandLine::ForCurrentProcess());
 }
 
 // static
 embedder::ScopedPlatformHandle MultiprocessTestHelper::client_platform_handle;
 
 }  // namespace test
 }  // namespace mojo