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 <stdint.h>
 
+#include <vector>
+
 #include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "blimp/common/proto/blimp_message.pb.h"
 #include "blimp/engine/browser/engine_render_widget_feature.h"
 #include "blimp/net/blimp_message_processor.h"
+#include "blimp/net/connection_error_observer.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"
 
 namespace aura {
 class WindowTreeHost;
 
 namespace client {
@@ skipping 22 matching lines @@
 
 namespace blimp {
 
 class BlimpConnection;
 class BlimpMessage;
 
 namespace engine {
 
 class BlimpBrowserContext;
 class BlimpFocusClient;
-class BlimpNetworkComponents;
 class BlimpScreen;
 class BlimpUiContextFactory;
 class BlimpWindowTreeHost;
+class EngineNetworkComponents;
 
 class BlimpEngineSession
     : public BlimpMessageProcessor,
       public content::WebContentsDelegate,
       public content::WebContentsObserver,
       public EngineRenderWidgetFeature::RenderWidgetMessageDelegate {
  public:
   explicit BlimpEngineSession(scoped_ptr<BlimpBrowserContext> browser_context,
                               net::NetLog* net_log);
   ~BlimpEngineSession() override;
@@ skipping 80 matching lines @@
 
   // Used to manage input capture.
   scoped_ptr<aura::client::DefaultCaptureClient> capture_client_;
 
   // Only one web_contents is supported for blimp 0.5
   scoped_ptr<content::WebContents> web_contents_;
 
   // 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_;
+  scoped_ptr<EngineNetworkComponents> net_components_;
 
   // Handles all incoming and outgoing messages related to RenderWidget,
   // including INPUT, COMPOSITOR and RENDER_WIDGET messages.
   // TODO(dtrainor, haibinlu): Move this to a higher level once we start dealing
   // with multiple tabs.
   EngineRenderWidgetFeature render_widget_feature_;
 
   scoped_ptr<BlimpMessageProcessor> tab_control_message_sender_;
   scoped_ptr<BlimpMessageProcessor> navigation_message_sender_;
 
   DISALLOW_COPY_AND_ASSIGN(BlimpEngineSession);
 };
 
 }  // namespace engine
 }  // namespace blimp
 
 #endif  // BLIMP_ENGINE_BROWSER_BLIMP_ENGINE_SESSION_H_