| Index: mojo/system/proxy_message_pipe_endpoint.cc
|
| diff --git a/mojo/system/proxy_message_pipe_endpoint.cc b/mojo/system/proxy_message_pipe_endpoint.cc
|
| index f3a3b34ba99c21582931cb810d5c3e1206f0dc7e..a52099f8d0b9d40c1f8b10029ecc98d942fb522a 100644
|
| --- a/mojo/system/proxy_message_pipe_endpoint.cc
|
| +++ b/mojo/system/proxy_message_pipe_endpoint.cc
|
| @@ -14,14 +14,20 @@
|
| namespace mojo {
|
| namespace system {
|
|
|
| -ProxyMessagePipeEndpoint::ProxyMessagePipeEndpoint()
|
| - : is_running_(false), is_peer_open_(true) {
|
| +ProxyMessagePipeEndpoint::ProxyMessagePipeEndpoint(
|
| + ChannelEndpoint* channel_endpoint)
|
| + : channel_endpoint_(channel_endpoint),
|
| + is_running_(false),
|
| + is_peer_open_(true) {
|
| }
|
|
|
| ProxyMessagePipeEndpoint::ProxyMessagePipeEndpoint(
|
| + ChannelEndpoint* channel_endpoint,
|
| LocalMessagePipeEndpoint* local_message_pipe_endpoint,
|
| bool is_peer_open)
|
| - : is_running_(false), is_peer_open_(is_peer_open) {
|
| + : channel_endpoint_(channel_endpoint),
|
| + is_running_(false),
|
| + is_peer_open_(is_peer_open) {
|
| paused_message_queue_.Swap(local_message_pipe_endpoint->message_queue());
|
| local_message_pipe_endpoint->Close();
|
| }
|
| @@ -72,12 +78,6 @@ void ProxyMessagePipeEndpoint::EnqueueMessage(
|
| }
|
| }
|
|
|
| -void ProxyMessagePipeEndpoint::Attach(ChannelEndpoint* channel_endpoint) {
|
| - DCHECK(channel_endpoint);
|
| - DCHECK(!is_attached());
|
| - channel_endpoint_ = channel_endpoint;
|
| -}
|
| -
|
| bool ProxyMessagePipeEndpoint::Run() {
|
| // Assertions about current state:
|
| DCHECK(is_attached());
|
|
|