From 713a5f2c310760e24319e91f7f6cfe47f6043d12 Mon Sep 17 00:00:00 2001 From: "phajdan.jr@chromium.org" Date: Sat, 11 Dec 2010 11:37:41 +0000 Subject: Revert "Add named testing interface." http://src.chromium.org/viewvc/chrome?view=rev&revision=67300 The change has been approved conditionally, i.e. if the outstanding review comments are handled in a follow-up as the top priority. Two weeks have passed, and I have not seen the follow-up. It is risky to keep this change in the tree, as it is already non-trivial to revert. Conflicts: chrome/browser/automation/automation_provider.cc chrome/test/ui/named_interface_uitest.cc ipc/ipc_channel_posix.cc TBR=nirnimesh BUG=chromium-os:8512 TEST=none Review URL: http://codereview.chromium.org/5707006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@68944 0039d316-1c4b-4281-b951-d872f2087c98 --- ipc/ipc_channel.h | 4 +--- ipc/ipc_channel_posix.cc | 10 ++-------- 2 files changed, 3 insertions(+), 11 deletions(-) (limited to 'ipc') diff --git a/ipc/ipc_channel.h b/ipc/ipc_channel.h index d07e3e5..132b494 100644 --- a/ipc/ipc_channel.h +++ b/ipc/ipc_channel.h @@ -39,9 +39,7 @@ class Channel : public Message::Sender { enum Mode { MODE_NONE, MODE_SERVER, - MODE_CLIENT, - MODE_NAMED_SERVER, - MODE_NAMED_CLIENT + MODE_CLIENT }; enum { diff --git a/ipc/ipc_channel_posix.cc b/ipc/ipc_channel_posix.cc index 7c03f44..9d0b81a 100644 --- a/ipc/ipc_channel_posix.cc +++ b/ipc/ipc_channel_posix.cc @@ -298,9 +298,8 @@ Channel::ChannelImpl::ChannelImpl(const IPC::ChannelHandle& channel_handle, : 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), @@ -311,11 +310,6 @@ Channel::ChannelImpl::ChannelImpl(const IPC::ChannelHandle& channel_handle, 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_handle, mode_)) { // The pipe may have been closed already. LOG(WARNING) << "Unable to create pipe named \"" << channel_handle.name -- cgit v1.1