Implementation and fixes for Blimp client/engine E2E communication.

blimp/engine/browser/blimp_engine_session.h

Index: blimp/engine/browser/blimp_engine_session.h
diff --git a/blimp/engine/browser/blimp_engine_session.h b/blimp/engine/browser/blimp_engine_session.h
index d327d7745e8dd602354255200deec968143ed0bc..1b85fabf201b84d49d29f238a37105584e443cc7 100644
--- a/blimp/engine/browser/blimp_engine_session.h
+++ b/blimp/engine/browser/blimp_engine_session.h
@@ -5,6 +5,8 @@
 #ifndef BLIMP_ENGINE_BROWSER_BLIMP_ENGINE_SESSION_H_
 #define BLIMP_ENGINE_BROWSER_BLIMP_ENGINE_SESSION_H_
 
+#include <vector>
+
 #include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "blimp/engine/browser/engine_render_widget_message_processor.h"
@@ -46,6 +48,9 @@ namespace blimp {
 
 class BlimpConnection;
 class BlimpMessage;
+class BrowserConnectionHandler;
+class EngineAuthenticationHandler;
+class EngineConnectionManager;
 
 namespace engine {
 
@@ -79,6 +84,9 @@ class BlimpEngineSession
                       const net::CompletionCallback& callback) override;
 
  private:
+  // Initializes the engine's network objects. Must be called on the IO thread.
+  void InitializeNetwork();
+
   // TabControlMessage handler methods.
   // Creates a new WebContents, which will be indexed by |target_tab_id|.
   void CreateWebContents(const int target_tab_id);
@@ -150,10 +158,12 @@ class BlimpEngineSession
   // with multiple tabs.
   EngineRenderWidgetMessageProcessor render_widget_processor_;
 
-  // Container for connection manager, authentication handler, and
-  // browser connection handler. The components run on the I/O thread, and
-  // this object is destroyed there.
-  scoped_ptr<BlimpNetworkComponents> net_components_;
+  // Objects for establishing and managing network connections.
+  // May only be accessed on the IO thread.
+  net::NetLog* net_log_;
+  scoped_ptr<BrowserConnectionHandler> connection_handler_;
+  scoped_ptr<EngineAuthenticationHandler> authentication_handler_;
+  scoped_ptr<EngineConnectionManager> connection_manager_;
 
   DISALLOW_COPY_AND_ASSIGN(BlimpEngineSession);
 };