Implementation and fixes for Blimp client/engine E2E communication.

blimp/engine/browser/blimp_engine_session.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_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"
 #include "blimp/net/blimp_message_processor.h"
 #include "content/public/browser/invalidate_type.h"
 #include "content/public/browser/web_contents_delegate.h"
 #include "content/public/browser/web_contents_observer.h"
 #include "net/base/completion_callback.h"
 #include "ui/gfx/geometry/size.h"
 
@@ skipping 21 matching lines @@
 }
 
 namespace wm {
 class FocusController;
 }
 
 namespace blimp {
 
 class BlimpConnection;
 class BlimpMessage;
+class BrowserConnectionHandler;
+class EngineAuthenticationHandler;
+class EngineConnectionManager;
 
 namespace engine {
 
 class BlimpBrowserContext;
 class BlimpFocusClient;
 class BlimpNetworkComponents;
 class BlimpScreen;
 class BlimpUiContextFactory;
 class BlimpWindowTreeHost;
 
@@ skipping 13 matching lines @@
   void Initialize();
 
   BlimpBrowserContext* browser_context() { return browser_context_.get(); }
 
   // BlimpMessageProcessor implementation.
   // TODO(haibinlu): Delete this and move to BlimpMessageDemultiplexer.
   void ProcessMessage(scoped_ptr<BlimpMessage> message,
                       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);
   void CloseWebContents(const int target_tab_id);
   void HandleResize(float device_pixel_ratio, const gfx::Size& size);
 
   // NavigationMessage handler methods.
   // Navigates the target tab to the |url|.
   void LoadUrl(const int target_tab_id, const GURL& url);
   void GoBack(const int target_tab_id);
@@ skipping 51 matching lines @@
   scoped_ptr<aura::client::DefaultCaptureClient> capture_client_;
 
   // Only one web_contents is supported for blimp 0.5
   scoped_ptr<content::WebContents> web_contents_;
 
   // The bridge to the network layer that does the RenderWidget proto/id work.
   // TODO(dtrainor, haibinlu): Move this to a higher level once we start dealing
   // 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);
 };
 
 }  // namespace engine
 }  // namespace blimp
 
 #endif  // BLIMP_ENGINE_BROWSER_BLIMP_ENGINE_SESSION_H_