summaryrefslogtreecommitdiffstats
path: root/ipc/attachment_broker_privileged_win_unittest.cc
diff options
context:
space:
mode:
authorerikchen <erikchen@chromium.org>2016-02-16 17:25:27 -0800
committerCommit bot <commit-bot@chromium.org>2016-02-17 01:26:24 +0000
commit346a38381d14199e8bf62b8aff4b3e28948e0398 (patch)
treed143120be858bb07108e8c6d49e1b55b480a54c4 /ipc/attachment_broker_privileged_win_unittest.cc
parent8fa61a69304e774ec9e4c1e944a2fc151c02c0ab (diff)
downloadchromium_src-346a38381d14199e8bf62b8aff4b3e28948e0398.zip
chromium_src-346a38381d14199e8bf62b8aff4b3e28948e0398.tar.gz
chromium_src-346a38381d14199e8bf62b8aff4b3e28948e0398.tar.bz2
Revert of Clean up public interface of AttachmentBrokerUnprivileged. (patchset #6 id:120001 of https://codereview.chromium.org/1679763002/ )
Reason for revert: failures on Chromium Memory FYI: http://build.chromium.org/p/chromium.memory.fyi/ Failure notification for "memory test: remoting" on "Chromium Mac (valgrind)(2)". Please see if the failures are related to your commit and take appropriate actions (e.g. revert, update suppressions, notify sheriff, etc.). For more info on the memory waterfall please see these links: http://dev.chromium.org/developers/tree-sheriffs/sheriff-details-chromium/memory-sheriff http://dev.chromium.org/developers/how-tos/using-valgrind http://dev.chromium.org/developers/how-tos/using-valgrind/threadsanitizer By the way, the current memory sheriff is on the CC list. http://build.chromium.org/p/chromium.memory.fyi/builders/Chromium%20Mac%20%28valgrind%29%282%29/builds/37788 Original issue's description: > Clean up public interface of AttachmentBrokerUnprivileged. > > In the old interface, a static factory method returns a scoped_ptr, and the > caller had to manage the lifetime. Since this is a global object with minimal > memory footprint, and is required to outlive every IPC::Channel, it's much > easier for the global to never be destroyed. This also matches the interface for > AttachmentBrokerPrivileged. > > BUG=584297 > > Committed: https://crrev.com/11fea2242b3a197993dbd5a1f977f9a31c6b98e4 > Cr-Commit-Position: refs/heads/master@{#375674} TBR=tsepez@chromium.org,avi@chromium.org,mseaborn@chromium.org,sergeyu@chromium.org # Skipping CQ checks because original CL landed less than 1 days ago. NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=584297 Review URL: https://codereview.chromium.org/1704743002 Cr-Commit-Position: refs/heads/master@{#375739}
Diffstat (limited to 'ipc/attachment_broker_privileged_win_unittest.cc')
-rw-r--r--ipc/attachment_broker_privileged_win_unittest.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/ipc/attachment_broker_privileged_win_unittest.cc b/ipc/attachment_broker_privileged_win_unittest.cc
index 870e262..07f37a3 100644
--- a/ipc/attachment_broker_privileged_win_unittest.cc
+++ b/ipc/attachment_broker_privileged_win_unittest.cc
@@ -267,7 +267,7 @@ class IPCAttachmentBrokerPrivilegedWinTest : public IPCTestBase {
set_broker(new IPC::AttachmentBrokerUnprivilegedWin);
broker_->AddObserver(&observer_, task_runner());
CreateChannel(&proxy_listener_);
- broker_->RegisterBrokerCommunicationChannel(channel());
+ broker_->DesignateBrokerCommunicationChannel(channel());
ASSERT_TRUE(ConnectChannel());
ASSERT_TRUE(StartClient());