summaryrefslogtreecommitdiffstats
path: root/ipc/placeholder_brokerable_attachment.h
diff options
context:
space:
mode:
authorerikchen <erikchen@chromium.org>2015-08-27 12:49:58 -0700
committerCommit bot <commit-bot@chromium.org>2015-08-27 19:50:28 +0000
commit06faf0c0fb1bc6bd173af6152b928e2c80ab8f78 (patch)
treecfb938a5c8d9813000cbfefa65f30aaf89ac7b66 /ipc/placeholder_brokerable_attachment.h
parent3055ce7afdf11650d499378cb62ede310dc16f94 (diff)
downloadchromium_src-06faf0c0fb1bc6bd173af6152b928e2c80ab8f78.zip
chromium_src-06faf0c0fb1bc6bd173af6152b928e2c80ab8f78.tar.gz
chromium_src-06faf0c0fb1bc6bd173af6152b928e2c80ab8f78.tar.bz2
Revert of IPC: Add attachment brokering support to the message header. (patchset #3 id:40001 of https://codereview.chromium.org/1303103002/ )
Reason for revert: Reverting on suspicion of causing crashes in Canary. https://code.google.com/p/chromium/issues/detail?id=524032 Original issue's description: > Reland #1: IPC: Add attachment brokering support to the message header. > > This reland fixes a race condition in the unit test SendHandleTwice that caused > the test to flakily fail, mostly on XP machines. This reland also updates switch > statements to contain a block for the newly added enum > BrokerableAttachment::PLACEHOLDER, which was causing problems with the clang > Windows build. > > > Message dispatch happens before message translation, and message dispatch > > requires that all brokered attachments have been received. This means that > > attachment brokering needs to function without message translation. This is > > accomplished by modifying the message header to include a new field > > num_brokered_attachments, and writing the attachment ids into the IPC Channel > > immediately following the pickled message itself. > > > > AttachmentBrokerPrivilegedWinUnittest was expanded to test ChannelReader in the > > receiving process. It is now a fully functional end-to-end test of attachment > > brokering. > > > > BUG=493414 > > TBR=tsepez@chromium.org > BUG=493414 > > Committed: https://crrev.com/37a2e0b682555bf35852d707dbd74b68f345841f > Cr-Commit-Position: refs/heads/master@{#344933} TBR= NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=493414 Review URL: https://codereview.chromium.org/1312433009 Cr-Commit-Position: refs/heads/master@{#345960}
Diffstat (limited to 'ipc/placeholder_brokerable_attachment.h')
-rw-r--r--ipc/placeholder_brokerable_attachment.h28
1 files changed, 0 insertions, 28 deletions
diff --git a/ipc/placeholder_brokerable_attachment.h b/ipc/placeholder_brokerable_attachment.h
deleted file mode 100644
index 7a63c72..0000000
--- a/ipc/placeholder_brokerable_attachment.h
+++ /dev/null
@@ -1,28 +0,0 @@
-// Copyright 2015 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.
-
-#ifndef IPC_PLACEHOLDER_BROKERABLE_ATTACHMENT_H_
-#define IPC_PLACEHOLDER_BROKERABLE_ATTACHMENT_H_
-
-#include "ipc/brokerable_attachment.h"
-#include "ipc/ipc_export.h"
-
-namespace IPC {
-
-// This subclass of BrokerableAttachment has an AttachmentId, and nothing else.
-// It is intended to be replaced by the attachment broker.
-class IPC_EXPORT PlaceholderBrokerableAttachment : public BrokerableAttachment {
- public:
- PlaceholderBrokerableAttachment(const AttachmentId& id)
- : BrokerableAttachment(id){};
- BrokerableType GetBrokerableType() const override;
-
- protected:
- ~PlaceholderBrokerableAttachment() override{};
- DISALLOW_COPY_AND_ASSIGN(PlaceholderBrokerableAttachment);
-};
-
-} // namespace IPC
-
-#endif // IPC_PLACEHOLDER_BROKERABLE_ATTACHMENT_H_