Implementation and fixes for Blimp client/engine E2E communication.

blimp/net/blimp_connection.h

 // 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.
 
 #ifndef BLIMP_NET_BLIMP_CONNECTION_H_
 #define BLIMP_NET_BLIMP_CONNECTION_H_
 
 #include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
+#include "base/observer_list.h"
 #include "blimp/net/blimp_net_export.h"
+#include "blimp/net/connection_error_observer.h"
 
 namespace blimp {
 
 class BlimpMessageProcessor;
 class BlimpMessagePump;
-class ConnectionErrorObserver;
 class PacketReader;
 class PacketWriter;
 
 // Encapsulates the state and logic used to exchange BlimpMessages over
 // a network connection.
-class BLIMP_NET_EXPORT BlimpConnection {
+class BLIMP_NET_EXPORT BlimpConnection : public ConnectionErrorObserver {
  public:
   BlimpConnection(scoped_ptr<PacketReader> reader,
                   scoped_ptr<PacketWriter> writer);
 
-  virtual ~BlimpConnection();
+  ~BlimpConnection() override;
 
-  // Lets |observer| know when the network connection encounters an error.
-  virtual void SetConnectionErrorObserver(ConnectionErrorObserver* observer);
+  // Adds |observer| to the connection's error observer list.
+  virtual void AddConnectionErrorObserver(ConnectionErrorObserver* observer);
+
+  // Removes all error observers from the observer list.
+  // Should be used to suppress error output in cases where an expected error
+  // code should be suppressed, e.g. on graceful disconnects.
+  virtual void ClearConnectionErrorObservers();

[haibinlu, 2016/01/04 19:45:45]

per offline discussion, this can be removed.

[Kevin M, 2016/01/04 20:42:13]

Removed this and relocated error observers to the end of the field list, so that
the observers are deleted before the socket objects, effectively suppressing
errors.

+
+  // Removes |observer| from the connection's error observer list.
+  virtual void RemoveConnectionErrorObserver(ConnectionErrorObserver* observer);
 
   // Sets the processor which will take incoming messages for this connection.
   // Can be set multiple times, but previously set processors are discarded.
   // Caller retains the ownership of |processor|.
   virtual void SetIncomingMessageProcessor(BlimpMessageProcessor* processor);
 
   // Gets a processor for BrowserSession->BlimpConnection message routing.
   virtual BlimpMessageProcessor* GetOutgoingMessageProcessor();
 
+  // ConnectionErrorObserver implementation.
+  void OnConnectionError(int error) override;

[haibinlu, 2016/01/04 19:45:45]

move this to private

[Kevin M, 2016/01/04 20:42:13]

Done.

+
  protected:
   BlimpConnection();
 
  private:
+  base::ObserverList<ConnectionErrorObserver> error_observers_;
   scoped_ptr<PacketReader> reader_;
   scoped_ptr<BlimpMessagePump> message_pump_;
   scoped_ptr<PacketWriter> writer_;
   scoped_ptr<BlimpMessageProcessor> outgoing_msg_processor_;
 
   DISALLOW_COPY_AND_ASSIGN(BlimpConnection);
 };
 
 }  // namespace blimp
 
 #endif  // BLIMP_NET_BLIMP_CONNECTION_H_