Implementation and fixes for Blimp client/engine E2E communication.

blimp/net/browser_connection_handler.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/browser_connection_handler.h"
 
 #include "base/logging.h"
 #include "base/macros.h"
 #include "blimp/net/blimp_connection.h"
 #include "blimp/net/blimp_message_checkpointer.h"
@@ skipping 24 matching lines @@
 
 scoped_ptr<BlimpMessageProcessor> BrowserConnectionHandler::RegisterFeature(
     BlimpMessage::Type type,
     BlimpMessageProcessor* incoming_processor) {
   demultiplexer_->AddProcessor(type, incoming_processor);
   return multiplexer_->CreateSenderForType(type);
 }
 
 void BrowserConnectionHandler::HandleConnection(
     scoped_ptr<BlimpConnection> connection) {
-  // Since there is only a single Client, assume a newer connection should
-  // replace an existing one.
-  DropCurrentConnection();
+  DCHECK(connection);
+  VLOG(1) << "HandleConnection " << connection;
+
+  if (connection_) {
+    DropCurrentConnection();
+  }
   connection_ = std::move(connection);
-  connection_->SetConnectionErrorObserver(this);
 
-  // Connect the incoming & outgoing message streams.
-  connection_->SetIncomingMessageProcessor(checkpointer_.get());
+  // Hook up message streams to the connection.
+  connection_->SetIncomingMessageProcessor(demultiplexer_.get());
   output_buffer_->SetOutputProcessor(
       connection_->GetOutgoingMessageProcessor());
+  connection_->AddConnectionErrorObserver(this);
+}
+
+void BrowserConnectionHandler::OnConnectionError(int error) {
+  DropCurrentConnection();
 }
 
 void BrowserConnectionHandler::DropCurrentConnection() {
-  if (!connection_)
-    return;
+  DCHECK(connection_);
+  output_buffer_->SetOutputProcessor(nullptr);
 
-  connection_->SetConnectionErrorObserver(nullptr);
-  connection_->SetIncomingMessageProcessor(nullptr);
-  output_buffer_->SetOutputProcessor(nullptr);
+  // Squelch any errors that are thrown as a result of dropping the connection.
+  connection_->ClearConnectionErrorObservers();
+
   connection_.reset();
 }
 
-void BrowserConnectionHandler::OnConnectionError(int error) {
-  LOG(WARNING) << "Connection error " << net::ErrorToString(error);
-  DropCurrentConnection();
-}
-
 }  // namespace blimp