BlobChannelService is modified to be Mojo Service.

blimp/engine/session/blimp_engine_session.cc

 // 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.
 
 #include "blimp/engine/session/blimp_engine_session.h"
 
 #include <string>
 #include <utility>
 
 #include "base/command_line.h"
 #include "base/memory/ptr_util.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "base/trace_event/trace_event.h"
 #include "blimp/common/blob_cache/in_memory_blob_cache.h"
 #include "blimp/common/create_blimp_message.h"
 #include "blimp/common/proto/tab_control.pb.h"
 #include "blimp/engine/app/blimp_engine_config.h"
 #include "blimp/engine/app/settings_manager.h"
 #include "blimp/engine/app/switches.h"
 #include "blimp/engine/app/ui/blimp_layout_manager.h"
 #include "blimp/engine/app/ui/blimp_screen.h"
 #include "blimp/engine/app/ui/blimp_window_tree_client.h"
 #include "blimp/engine/app/ui/blimp_window_tree_host.h"
 #include "blimp/engine/common/blimp_browser_context.h"
 #include "blimp/engine/common/blimp_user_agent.h"
+#include "blimp/engine/mojo/blob_channel_service.h"
 #include "blimp/engine/session/tab.h"
 #include "blimp/net/blimp_connection.h"
 #include "blimp/net/blimp_connection_statistics.h"
 #include "blimp/net/blimp_message_multiplexer.h"
 #include "blimp/net/blimp_message_thread_pipe.h"
 #include "blimp/net/blob_channel/blob_channel_sender_impl.h"
 #include "blimp/net/blob_channel/helium_blob_sender_delegate.h"
 #include "blimp/net/browser_connection_handler.h"
 #include "blimp/net/common.h"
 #include "blimp/net/engine_authentication_handler.h"
@@ skipping 196 matching lines @@
       kDefaultScaleFactor,
       gfx::Size(kDefaultDisplayWidth, kDefaultDisplayHeight));
   render_widget_feature_.SetDelegate(kDummyTabId, this);
 
   std::unique_ptr<HeliumBlobSenderDelegate> helium_blob_delegate(
       new HeliumBlobSenderDelegate);
   blob_delegate_ = helium_blob_delegate.get();
   blob_channel_sender_ = base::WrapUnique(
       new BlobChannelSenderImpl(base::WrapUnique(new InMemoryBlobCache),
                                 std::move(helium_blob_delegate)));
-
+  blob_channel_service_ =

[Kevin M, 2016/07/28 18:14:47]

Switch this to MakeUnique

[CJ, 2016/07/28 19:54:15]

Done.

+      base::WrapUnique(new BlobChannelService(blob_channel_sender_.get()));
   content::GeolocationProvider::SetGeolocationDelegate(
       geolocation_feature_.CreateGeolocationDelegate());
 }
 
 BlimpEngineSession::~BlimpEngineSession() {
   render_widget_feature_.RemoveDelegate(kDummyTabId);
 
   window_tree_host_->GetInputMethod()->RemoveObserver(this);
 
   // Ensure that all tabs are torn down first, since teardown will
@@ skipping 36 matching lines @@
 
   // Initialize must only be posted after the RegisterFeature calls have
   // completed.
   content::BrowserThread::PostTask(
       content::BrowserThread::IO, FROM_HERE,
       base::Bind(&EngineNetworkComponents::Initialize,
                  base::Unretained(net_components_.get()),
                  engine_config_->client_token()));
 }
 
+EngineGeolocationFeature* BlimpEngineSession::GetGeolocationFeature() {

[Kevin M, 2016/07/28 18:14:47]

??

[CJ, 2016/07/28 19:54:15]

I think I screwed up merging. Fixing.

+  return &geolocation_feature_;
+}
+
 void BlimpEngineSession::GetEnginePortForTesting(
     const GetPortCallback& callback) {
   content::BrowserThread::PostTaskAndReplyWithResult(
       content::BrowserThread::IO, FROM_HERE,
       base::Bind(&EngineNetworkComponents::GetPortForTesting,
                  base::Unretained(net_components_.get())),
       callback);
 }
 
 void BlimpEngineSession::RegisterFeatures() {
@@ skipping 261 matching lines @@
     parent->AddChild(content);
   content->Show();
 
   tab_ = base::WrapUnique(new Tab(std::move(new_contents), target_tab_id,
                                   &render_widget_feature_,
                                   navigation_message_sender_.get()));
 }
 
 }  // namespace engine
 }  // namespace blimp