Use Chromium BUILD to approximate Blimp protocol version, and check it.

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 "base/callback_helpers.h"
 #include "base/logging.h"
 #include "base/macros.h"
 #include "base/memory/weak_ptr.h"
@@ skipping 81 matching lines @@
   DVLOG(2) << "OnWritePacketComplete, result=" << result;
   DCHECK_NE(net::ERR_IO_PENDING, result);
   base::ResetAndReturn(&pending_process_msg_callback_).Run(result);
   if (result != net::OK) {
     error_observer_->OnConnectionError(result);
   }
 }
 
 }  // namespace
 
+class BlimpConnection::EndConnectionHandler

[Kevin M, 2016/05/25 21:19:19]

Comment on the class' purpose?

[Wez, 2016/05/25 23:11:36]

Done.

+    : public BlimpMessageProcessor {
+ public:
+  explicit EndConnectionHandler(BlimpConnection* connection)
+      : connection_(connection), message_handler_(nullptr) {}
+
+  void set_message_handler(BlimpMessageProcessor* message_handler) {
+    message_handler_ = message_handler;
+  }
+
+  // BlimpMessageProcessor implementation.
+  void ProcessMessage(std::unique_ptr<BlimpMessage> message,
+                      const net::CompletionCallback& callback) override {
+    if (message->has_protocol_control() &&
+        message->protocol_control().has_end_connection()) {
+      // Report the EndConnection reason to connection error observers.
+      connection_->OnConnectionError(
+          message->protocol_control().end_connection().reason());
+
+      // Caller is responsible for ensuring |callback| is still safe to call.
+      callback.Run(message->protocol_control().end_connection().reason());
+      return;
+    }
+
+    message_handler_->ProcessMessage(std::move(message), callback);
+  }
+
+ private:
+  BlimpConnection* connection_;
+  BlimpMessageProcessor* message_handler_;

[Kevin M, 2016/05/25 21:19:19]

Document the role of |message_handler_|?

[Wez, 2016/05/25 23:11:37]

Done.

+
+  DISALLOW_COPY_AND_ASSIGN(EndConnectionHandler);
+};
+
 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())) {
+      outgoing_msg_processor_(new BlimpMessageSender(writer_.get())),
+      end_connection_handler_(new EndConnectionHandler(this)) {
   DCHECK(writer_);
 
   // Observe the connection errors received by any of this connection's network
   // objects.
   message_pump_->set_error_observer(this);
   BlimpMessageSender* sender =
       static_cast<BlimpMessageSender*>(outgoing_msg_processor_.get());
   sender->set_error_observer(this);
 }
 
 BlimpConnection::BlimpConnection() {}
 
 BlimpConnection::~BlimpConnection() {
   VLOG(1) << "BlimpConnection destroyed.";
 }
 
 void BlimpConnection::AddConnectionErrorObserver(
     ConnectionErrorObserver* observer) {
   error_observers_.AddObserver(observer);
 }
 
 void BlimpConnection::RemoveConnectionErrorObserver(
     ConnectionErrorObserver* observer) {
   error_observers_.RemoveObserver(observer);
 }
 
 void BlimpConnection::SetIncomingMessageProcessor(
     BlimpMessageProcessor* processor) {
-  message_pump_->SetMessageProcessor(processor);
+  end_connection_handler_->set_message_handler(processor);
+  message_pump_->SetMessageProcessor(processor ? end_connection_handler_.get()
+                                               : nullptr);
 }
 
 BlimpMessageProcessor* BlimpConnection::GetOutgoingMessageProcessor() {
   return outgoing_msg_processor_.get();
 }
 
 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