Clean up thread handling in Blimp browser tests.

blimp/engine/session/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_SESSION_BLIMP_ENGINE_SESSION_H_
 #define BLIMP_ENGINE_SESSION_BLIMP_ENGINE_SESSION_H_
 
 #include <stdint.h>
 
 #include <memory>
 #include <vector>
 
 #include "base/macros.h"
 #include "blimp/common/proto/blimp_message.pb.h"
 #include "blimp/engine/feature/engine_render_widget_feature.h"
 #include "blimp/engine/feature/engine_settings_feature.h"
 #include "blimp/engine/feature/geolocation/engine_geolocation_feature.h"
 #include "blimp/engine/mojo/blob_channel_service.h"
 #include "blimp/net/blimp_message_processor.h"
+#include "blimp/net/blob_channel/blob_channel_sender_impl.h"
 #include "blimp/net/connection_error_observer.h"
 #include "content/public/browser/invalidate_type.h"
 #include "content/public/browser/web_contents_delegate.h"
 #include "net/base/completion_callback.h"
 #include "ui/base/ime/input_method_observer.h"
 #include "ui/gfx/geometry/size.h"
 
 namespace aura {
 class WindowTreeHost;
 
@@ skipping 20 matching lines @@
 namespace wm {
 class FocusController;
 }
 
 namespace blimp {
 
 class BlimpConnection;
 class BlimpMessage;
 class BlimpMessageThreadPipe;
 class BlobCache;
-class BlobChannelSender;
 class HeliumBlobSenderDelegate;
 class ThreadPipeManager;
 class SettingsManager;
 
 namespace engine {
 
 class BlimpBrowserContext;
 class BlimpEngineConfig;
 class BlimpFocusClient;
 class BlimpScreen;
@@ skipping 19 matching lines @@
   // values for e.g. screen size pending real values being supplied by the
   // client.
   void Initialize();
 
   BlimpBrowserContext* browser_context() { return browser_context_.get(); }
 
   BlobChannelSender* blob_channel_sender() {
     return blob_channel_sender_.get();
   }
 
-  BlobChannelService* blob_channel_service() {
-    return blob_channel_service_.get();
-  }
+  BlobChannelService* GetBlobChannelService();
 
   // Gets Engine's listening port. Invokes callback with the allocated port.
   void GetEnginePortForTesting(const GetPortCallback& callback);
 
   // BlimpMessageProcessor implementation.
   // This object handles incoming TAB_CONTROL and NAVIGATION messages directly.
   void ProcessMessage(std::unique_ptr<BlimpMessage> message,
                       const net::CompletionCallback& callback) override;
 
  private:
@@ skipping 88 matching lines @@
 
   // Handles all incoming and outgoing messages related to RenderWidget,
   // including INPUT, COMPOSITOR and RENDER_WIDGET messages.
   EngineRenderWidgetFeature render_widget_feature_;
 
   // Sends outgoing blob data as BlimpMessages.
   HeliumBlobSenderDelegate* blob_delegate_;
 
   // Receives image data and sends it to the client via
   // |blob_delegate_|.
-  std::unique_ptr<BlobChannelSender> blob_channel_sender_;
+  std::unique_ptr<BlobChannelSenderImpl> blob_channel_sender_;
+
+  std::unique_ptr<base::WeakPtrFactory<BlobChannelSenderImpl>>
+      blob_channel_sender_weak_factory_;
 
   // Receives image data from the renderer and sends it to
   // |blob_channel_sender_|.
   std::unique_ptr<BlobChannelService> blob_channel_service_;
 
   // Handles all incoming and outgoing messages related to Geolocation.
   EngineGeolocationFeature geolocation_feature_;
 
   // Container for connection manager, authentication handler, and
   // browser connection handler. The components run on the I/O thread, and
   // this object is destroyed there.
   std::unique_ptr<EngineNetworkComponents> net_components_;
 
   std::unique_ptr<ThreadPipeManager> thread_pipe_manager_;
 
   // Used to send TAB_CONTROL or NAVIGATION messages to client.
   std::unique_ptr<BlimpMessageProcessor> tab_control_message_sender_;
   std::unique_ptr<BlimpMessageProcessor> navigation_message_sender_;
 
   // TODO(haibinlu): Support more than one tab (crbug/547231)
   std::unique_ptr<Tab> tab_;
 
   DISALLOW_COPY_AND_ASSIGN(BlimpEngineSession);
 };
 
 }  // namespace engine
 }  // namespace blimp
 
 #endif  // BLIMP_ENGINE_SESSION_BLIMP_ENGINE_SESSION_H_