BlobChannelService is modified to be Mojo Service.

blimp/engine/session/blimp_engine_session.cc

Index: blimp/engine/session/blimp_engine_session.cc
diff --git a/blimp/engine/session/blimp_engine_session.cc b/blimp/engine/session/blimp_engine_session.cc
index e6d1d0517e699379ee9619ae33eda23ef22a7f76..b19e1cfb21391c23316e8291e4f6e6d3a00b071d 100644
--- a/blimp/engine/session/blimp_engine_session.cc
+++ b/blimp/engine/session/blimp_engine_session.cc
@@ -25,6 +25,7 @@
 #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"
@@ -241,7 +242,8 @@ BlimpEngineSession::BlimpEngineSession(
   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());
 }
@@ -298,6 +300,10 @@ void BlimpEngineSession::Initialize() {
                  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(