summaryrefslogtreecommitdiffstats
path: root/ipc/attachment_broker_privileged_win_unittest.cc
diff options
context:
space:
mode:
authoravi <avi@chromium.org>2015-07-30 12:40:37 -0700
committerCommit bot <commit-bot@chromium.org>2015-07-30 19:41:17 +0000
commit090599613215def05230b90969a5747f0f06315a (patch)
tree07b1163a76aaab0b60a9fc95187bc57228452d6b /ipc/attachment_broker_privileged_win_unittest.cc
parent2764561f205fa201f971477ae16405236f1c8b16 (diff)
downloadchromium_src-090599613215def05230b90969a5747f0f06315a.zip
chromium_src-090599613215def05230b90969a5747f0f06315a.tar.gz
chromium_src-090599613215def05230b90969a5747f0f06315a.tar.bz2
Revert of ipc: Clean up interface of attachment broker. (patchset #5 id:80001 of https://codereview.chromium.org/1269553003/)
Reason for revert: Causes failures in: IPCAttachmentBrokerPrivilegedWinTest.SendHandle IPCAttachmentBrokerPrivilegedWinTest.SendHandleToSelf IPCAttachmentBrokerPrivilegedWinTest.SendHandleWithoutPermissions on the Win7 Tests (dbg)(1) bot http://build.chromium.org/p/chromium.win/builders/Win7%20Tests%20%28dbg%29%281%29/builds/40372/steps/ipc_tests/logs/stdio Original issue's description: > ipc: Clean up interface of attachment broker. > > AttachmentBrokerUnprivileged now has a method > DesignateBrokerCommunicationChannel which is used by non-broker processes to > designate an IPC::Channel as the communication medium for brokerable attachment > messages. IPC::Channel has a new member attachment_broker_endpoint_ which causes > it to pass all messages through the attachment broker before forwarding them to > the listener. > > BUG=493414 > > Committed: https://crrev.com/9a06836982214f2edced21bbd1615b49e7f231bf > Cr-Commit-Position: refs/heads/master@{#341143} TBR=tsepez@chromium.org,erikchen@chromium.org NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=493414 Review URL: https://codereview.chromium.org/1259953005 Cr-Commit-Position: refs/heads/master@{#341171}
Diffstat (limited to 'ipc/attachment_broker_privileged_win_unittest.cc')
-rw-r--r--ipc/attachment_broker_privileged_win_unittest.cc5
1 files changed, 1 insertions, 4 deletions
diff --git a/ipc/attachment_broker_privileged_win_unittest.cc b/ipc/attachment_broker_privileged_win_unittest.cc
index c4110bd..2140fd9 100644
--- a/ipc/attachment_broker_privileged_win_unittest.cc
+++ b/ipc/attachment_broker_privileged_win_unittest.cc
@@ -161,7 +161,7 @@ class IPCAttachmentBrokerPrivilegedWinTest : public IPCTestBase {
broker_->AddObserver(&observer_);
set_attachment_broker(broker_.get());
CreateChannel(&proxy_listener_);
- broker_->DesignateBrokerCommunicationChannel(channel());
+ broker_->set_sender(channel());
ASSERT_TRUE(ConnectChannel());
ASSERT_TRUE(StartClient());
}
@@ -278,9 +278,6 @@ TEST_F(IPCAttachmentBrokerPrivilegedWinTest, SendHandleToSelf) {
set_broker(new MockBroker);
CommonSetUp();
- // Technically, the channel is an endpoint, but we need the proxy listener to
- // receive the messages so that it can quit the message loop.
- channel()->set_attachment_broker_endpoint(false);
get_proxy_listener()->set_listener(get_broker());
HANDLE h = CreateTempFile();