Revert of IPC Fuzzer: Make ChannelMojo work when --enable-channel-mojo is givne

tools/ipc_fuzzer/replay/replay_process.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 "tools/ipc_fuzzer/replay/replay_process.h"
 
 #include <limits.h>
 #include <string>
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/files/file_path.h"
 #include "base/logging.h"
 #include "base/posix/global_descriptors.h"
 #include "chrome/common/chrome_switches.h"
 #include "ipc/ipc_descriptors.h"
 #include "ipc/ipc_switches.h"
-#include "ipc/mojo/ipc_channel_mojo.h"
 
 namespace ipc_fuzzer {
 
 ReplayProcess::ReplayProcess()
     : io_thread_("Chrome_ChildIOThread"),
       shutdown_event_(true, false),
       message_index_(0) {
 }
 
 ReplayProcess::~ReplayProcess() {
@@ skipping 32 matching lines @@
 #endif
 
   return true;
 }
 
 void ReplayProcess::OpenChannel() {
   std::string channel_name =
       base::CommandLine::ForCurrentProcess()->GetSwitchValueASCII(
           switches::kProcessChannelID);
 
-  bool should_use_mojo = base::CommandLine::ForCurrentProcess()->HasSwitch(
-      "enable-channel-mojo");
-  if (should_use_mojo) {
-    channel_ = IPC::ChannelProxy::Create(
-        IPC::ChannelMojo::CreateClientFactory(channel_name),
-        this,
-        io_thread_.message_loop_proxy());
-  } else {
-    channel_ = IPC::ChannelProxy::Create(channel_name,
-                                         IPC::Channel::MODE_CLIENT,
-                                         this,
-                                         io_thread_.message_loop_proxy());
-  }
+  channel_ = IPC::ChannelProxy::Create(channel_name,
+                                       IPC::Channel::MODE_CLIENT,
+                                       this,
+                                       io_thread_.message_loop_proxy());
 }
 
 bool ReplayProcess::OpenTestcase() {
   base::FilePath path =
       base::CommandLine::ForCurrentProcess()->GetSwitchValuePath(
           switches::kIpcFuzzerTestcase);
   return MessageFile::Read(path, &messages_);
 }
 
 void ReplayProcess::SendNextMessage() {
@@ skipping 26 matching lines @@
   return true;
 }
 
 void ReplayProcess::OnChannelError() {
   LOG(ERROR) << "Channel error, quitting after "
              << message_index_ << " messages";
   base::MessageLoop::current()->Quit();
 }
 
 }  // namespace ipc_fuzzer