| Index: remoting/protocol/channel_multiplexer.h
|
| diff --git a/remoting/protocol/channel_multiplexer.h b/remoting/protocol/channel_multiplexer.h
|
| index 2b93d2e553d42519524eeda8f9df35dca9cd6a23..c83b0f3b9616ea6e3352a0aed34888ae2385ab96 100644
|
| --- a/remoting/protocol/channel_multiplexer.h
|
| +++ b/remoting/protocol/channel_multiplexer.h
|
| @@ -9,6 +9,7 @@
|
| #include "remoting/proto/mux.pb.h"
|
| #include "remoting/protocol/buffered_socket_writer.h"
|
| #include "remoting/protocol/message_reader.h"
|
| +#include "remoting/protocol/protobuf_message_parser.h"
|
| #include "remoting/protocol/stream_channel_factory.h"
|
|
|
| namespace remoting {
|
| @@ -78,7 +79,8 @@ class ChannelMultiplexer : public StreamChannelFactory {
|
| std::map<int, MuxChannel*> channels_by_receive_id_;
|
|
|
| BufferedSocketWriter writer_;
|
| - ProtobufMessageReader<MultiplexPacket> reader_;
|
| + MessageReader reader_;
|
| + ProtobufMessageParser<MultiplexPacket> parser_;
|
|
|
| base::WeakPtrFactory<ChannelMultiplexer> weak_factory_;
|
|
|
|
|