Index: blimp/net/blimp_connection.cc |
diff --git a/blimp/net/blimp_connection.cc b/blimp/net/blimp_connection.cc |
index 51da7d9920bc04ce4c8e69191f5eb2b6681147f1..570fef3cc4c08beee43e52abbdc71c0568267ccd 100644 |
--- a/blimp/net/blimp_connection.cc |
+++ b/blimp/net/blimp_connection.cc |
@@ -4,6 +4,8 @@ |
#include "blimp/net/blimp_connection.h" |
+#include <utility> |
+ |
#include "base/callback_helpers.h" |
#include "base/logging.h" |
#include "base/macros.h" |
@@ -15,7 +17,7 @@ |
#include "blimp/net/blimp_message_pump.h" |
#include "blimp/net/common.h" |
#include "blimp/net/connection_error_observer.h" |
-#include "blimp/net/packet_reader.h" |
+#include "blimp/net/message_port.h" |
#include "blimp/net/packet_writer.h" |
#include "net/base/completion_callback.h" |
@@ -150,16 +152,11 @@ void BlimpConnection::EndConnectionFilter::ProcessMessage( |
message_handler_->ProcessMessage(std::move(message), callback); |
} |
-BlimpConnection::BlimpConnection(std::unique_ptr<PacketReader> reader, |
- std::unique_ptr<PacketWriter> writer) |
- : reader_(std::move(reader)), |
- message_pump_(new BlimpMessagePump(reader_.get())), |
- writer_(std::move(writer)), |
- outgoing_msg_processor_(new BlimpMessageSender(writer_.get())), |
+BlimpConnection::BlimpConnection(std::unique_ptr<MessagePort> message_port) |
+ : message_port_(std::move(message_port)), |
+ message_pump_(new BlimpMessagePump(message_port_->reader())), |
+ outgoing_msg_processor_(new BlimpMessageSender(message_port_->writer())), |
end_connection_filter_(new EndConnectionFilter(this)) { |
- DCHECK(writer_); |
- DCHECK(reader_); |
- |
message_pump_->set_error_observer(this); |
outgoing_msg_processor_->set_error_observer(this); |
} |