diff options
author | falken@chromium.org <falken@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-13 03:46:35 +0000 |
---|---|---|
committer | falken@chromium.org <falken@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-13 03:46:35 +0000 |
commit | 09e6752c18cb6961efb5bf55d83576640cd70c8b (patch) | |
tree | 1119bbea6af4c7d55252d64ac09ebdd2ba1e8331 /ipc/ipc_channel_posix_unittest.cc | |
parent | 09929e37e58f8b4a399e9913fcc3b56e3248a3ef (diff) | |
download | chromium_src-09e6752c18cb6961efb5bf55d83576640cd70c8b.zip chromium_src-09e6752c18cb6961efb5bf55d83576640cd70c8b.tar.gz chromium_src-09e6752c18cb6961efb5bf55d83576640cd70c8b.tar.bz2 |
Revert 187554 "Implement IPC::ChannelFactory, a class that accep..."
Reverting because it seems to cause failures on ipc_tests
(UnixDomainSocketUtil.Connect, UnixDomainSocketUtil.SendReceive) on Android.
> Implement IPC::ChannelFactory, a class that accept()s on a UNIX socket.
>
> IPC::ChannelFactory listens on a UNIX domain socket and notifies its delegate
> when a client connects. The delegate is expected to craft an IPC::Channel from
> the handle it is given.
>
> Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=186912
>
> Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=187233
>
> Review URL: https://chromiumcodereview.appspot.com/12386010
TBR=jeremya@chromium.org
Review URL: https://codereview.chromium.org/12431017
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@187760 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ipc/ipc_channel_posix_unittest.cc')
-rw-r--r-- | ipc/ipc_channel_posix_unittest.cc | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/ipc/ipc_channel_posix_unittest.cc b/ipc/ipc_channel_posix_unittest.cc index b49b096..448e648 100644 --- a/ipc/ipc_channel_posix_unittest.cc +++ b/ipc/ipc_channel_posix_unittest.cc @@ -21,7 +21,6 @@ #include "base/test/multiprocess_test.h" #include "base/test/test_timeouts.h" #include "ipc/ipc_listener.h" -#include "ipc/unix_domain_socket_util.h" #include "testing/multiprocess_func_list.h" namespace { @@ -146,7 +145,7 @@ void IPCChannelPosixTest::SetUpSocket(IPC::ChannelHandle *handle, struct sockaddr_un server_address = { 0 }; memset(&server_address, 0, sizeof(server_address)); server_address.sun_family = AF_UNIX; - int path_len = snprintf(server_address.sun_path, IPC::kMaxSocketNameLength, + int path_len = snprintf(server_address.sun_path, IPC::kMaxPipeNameLength, "%s", name.c_str()); DCHECK_EQ(static_cast<int>(name.length()), path_len); size_t server_address_len = offsetof(struct sockaddr_un, @@ -312,7 +311,7 @@ TEST_F(IPCChannelPosixTest, BadChannelName) { "future-proof_growth_strategies_Continually" "pontificate_proactive_potentialities_before" "leading-edge_processes"; - EXPECT_GE(strlen(kTooLongName), IPC::kMaxSocketNameLength); + EXPECT_GE(strlen(kTooLongName), IPC::kMaxPipeNameLength); IPC::ChannelHandle handle2(kTooLongName); IPC::Channel channel2(handle2, IPC::Channel::MODE_NAMED_SERVER, NULL); EXPECT_FALSE(channel2.Connect()); |