Decouple Blimp transport output from BlimpConnections using MessagePort.

blimp/net/blimp_connection.cc

 // 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.
 
 #include "blimp/net/blimp_connection.h"
 
+#include <utility>
+
 #include "base/callback_helpers.h"
 #include "base/logging.h"
 #include "base/macros.h"
 #include "base/memory/weak_ptr.h"
 #include "base/message_loop/message_loop.h"
 #include "blimp/common/logging.h"
 #include "blimp/common/proto/blimp_message.pb.h"
 #include "blimp/net/blimp_message_processor.h"
 #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"
 
 namespace blimp {
 
 // Forwards incoming blimp messages to PacketWriter.
 class BlimpMessageSender : public BlimpMessageProcessor {
  public:
   explicit BlimpMessageSender(PacketWriter* writer);
   ~BlimpMessageSender() override;
@@ skipping 114 matching lines @@
         message->protocol_control().end_connection().reason());
 
     // Caller must ensure |callback| safe to call after OnConnectionError.
     callback.Run(message->protocol_control().end_connection().reason());
     return;
   }
 
   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);
 }
 
 BlimpConnection::BlimpConnection() {}
 
 BlimpConnection::~BlimpConnection() {
   VLOG(1) << "BlimpConnection destroyed.";
 }
 
@@ skipping 20 matching lines @@
 
 void BlimpConnection::OnConnectionError(int error) {
   VLOG(1) << "OnConnectionError, error=" << error;
 
   // Propagate the error to all observers.
   FOR_EACH_OBSERVER(ConnectionErrorObserver, error_observers_,
                     OnConnectionError(error));
 }
 
 }  // namespace blimp