Revert 66350 - Add named testing interface. This allows you to connect to a p...

ipc/ipc_channel_posix.cc

 // Copyright (c) 2010 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 "ipc/ipc_channel_posix.h"
 
 #include <errno.h>
 #include <fcntl.h>
 #include <stddef.h>
 #include <sys/types.h>
@@ skipping 255 matching lines @@
 }
 
 }  // namespace
 //------------------------------------------------------------------------------
 
 Channel::ChannelImpl::ChannelImpl(const std::string& channel_id, Mode mode,
                                   Listener* listener)
     : mode_(mode),
       is_blocked_on_write_(false),
       message_send_bytes_written_(0),
-      uses_fifo_(
-          CommandLine::ForCurrentProcess()->HasSwitch(switches::kIPCUseFIFO) ||
-          mode == MODE_NAMED_SERVER || mode == MODE_NAMED_CLIENT),
+      uses_fifo_(CommandLine::ForCurrentProcess()->HasSwitch(
+                     switches::kIPCUseFIFO)),
       server_listen_pipe_(-1),
       pipe_(-1),
       client_pipe_(-1),
 #if !defined(OS_MACOSX)
       fd_pipe_(-1),
       remote_fd_pipe_(-1),
 #endif
       listener_(listener),
       waiting_connect_(true),
       factory_(this) {
-  if (mode_ == MODE_NAMED_SERVER)
-    mode_ = MODE_SERVER;
-  if (mode_ == MODE_NAMED_CLIENT)
-    mode_ = MODE_CLIENT;
-
-  if (!CreatePipe(channel_id, mode_)) {
+  if (!CreatePipe(channel_id, mode)) {
     // The pipe may have been closed already.
     PLOG(WARNING) << "Unable to create pipe named \"" << channel_id
-                  << "\" in " << (mode_ == MODE_SERVER ? "server" : "client")
+                  << "\" in " << (mode == MODE_SERVER ? "server" : "client")
                   << " mode";
   }
 }
 
 Channel::ChannelImpl::~ChannelImpl() {
   Close();
 }
 
 // static
 void AddChannelSocket(const std::string& name, int socket) {
@@ skipping 37 matching lines @@
 
 bool Channel::ChannelImpl::CreatePipe(const std::string& channel_id,
                                       Mode mode) {
   DCHECK(server_listen_pipe_ == -1 && pipe_ == -1);
 
   if (uses_fifo_) {
     // This only happens in unit tests; see the comment above PipeMap.
     // TODO(playmobil): We shouldn't need to create fifos on disk.
     // TODO(playmobil): If we do, they should be in the user data directory.
     // TODO(playmobil): Cleanup any stale fifos.
-    pipe_name_ = channel_id;
+    pipe_name_ = "/var/tmp/chrome_" + channel_id;
     if (mode == MODE_SERVER) {
       if (!CreateServerFifo(pipe_name_, &server_listen_pipe_)) {
         return false;
       }
     } else {
       if (!ClientConnectToFifo(pipe_name_, &pipe_)) {
         return false;
       }
       waiting_connect_ = false;
     }
@@ skipping 716 matching lines @@
 
 bool Channel::Send(Message* message) {
   return channel_impl_->Send(message);
 }
 
 int Channel::GetClientFileDescriptor() const {
   return channel_impl_->GetClientFileDescriptor();
 }
 
 }  // namespace IPC