Create new class "CastTransport", which encapsulates the message read and write event loops.

extensions/browser/api/cast_channel/cast_channel_api.cc

 // Copyright 2014 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 "extensions/browser/api/cast_channel/cast_channel_api.h"
 
 #include <limits>
 #include <string>
 
 #include "base/json/json_writer.h"
@@ skipping 114 matching lines @@
 static base::LazyInstance<BrowserContextKeyedAPIFactory<CastChannelAPI> >
     g_factory = LAZY_INSTANCE_INITIALIZER;
 
 // static
 BrowserContextKeyedAPIFactory<CastChannelAPI>*
 CastChannelAPI::GetFactoryInstance() {
   return g_factory.Pointer();
 }
 
 scoped_ptr<CastSocket> CastChannelAPI::CreateCastSocket(
-    const std::string& extension_id, const net::IPEndPoint& ip_endpoint,
-    ChannelAuthType channel_auth, const base::TimeDelta& timeout) {
+    const std::string& extension_id,
+    const net::IPEndPoint& ip_endpoint,
+    ChannelAuthType channel_auth,
+    const base::TimeDelta& timeout) {

[Wez, 2014/09/25 02:09:15]

nit: These can be un-wrapped.

[Kevin M, 2014/09/25 17:53:04]

Done.

   if (socket_for_test_.get()) {
     return socket_for_test_.Pass();
   } else {
     return scoped_ptr<CastSocket>(
         new CastSocket(extension_id,
                        ip_endpoint,
                        channel_auth,
                        this,
                        ExtensionsBrowserClient::Get()->GetNetLog(),
                        timeout,
@@ skipping 270 matching lines @@
     case base::Value::TYPE_BINARY:
       break;
     default:
       SetError("Invalid type of message_info.data");
       return false;
   }
   return true;
 }
 
 void CastChannelSendFunction::AsyncWorkStart() {
-  CastSocket* socket = GetSocketOrCompleteWithError(
-      params_->channel.channel_id);
+  CastSocket* socket =
+      GetSocketOrCompleteWithError(params_->channel.channel_id);

[Wez, 2014/09/25 02:09:15]

nit: And these.

[Kevin M, 2014/09/25 17:53:04]

Done.

   if (socket)
     socket->SendMessage(params_->message,
                         base::Bind(&CastChannelSendFunction::OnSend, this));
 }
 
 void CastChannelSendFunction::OnSend(int result) {
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
   int channel_id = params_->channel.channel_id;
   CastSocket* socket = GetSocket(channel_id);
   if (result < 0 || !socket) {
     SetResultFromError(channel_id,
                        cast_channel::CHANNEL_ERROR_SOCKET_ERROR);
   } else {
     SetResultFromSocket(*socket);
   }
   AsyncWorkCompleted();
 }
 
 CastChannelCloseFunction::CastChannelCloseFunction() { }
 
 CastChannelCloseFunction::~CastChannelCloseFunction() { }
 
 bool CastChannelCloseFunction::Prepare() {
   params_ = Close::Params::Create(*args_);
   EXTENSION_FUNCTION_VALIDATE(params_.get());
   return true;
 }
 
 void CastChannelCloseFunction::AsyncWorkStart() {
-  CastSocket* socket = GetSocketOrCompleteWithError(
-      params_->channel.channel_id);
+  CastSocket* socket =
+      GetSocketOrCompleteWithError(params_->channel.channel_id);

[Wez, 2014/09/25 02:09:15]

nit: And this!

[Kevin M, 2014/09/25 17:53:04]

Done.

   if (socket)
     socket->Close(base::Bind(&CastChannelCloseFunction::OnClose, this));
 }
 
 void CastChannelCloseFunction::OnClose(int result) {
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
   VLOG(1) << "CastChannelCloseFunction::OnClose result = " << result;
   int channel_id = params_->channel.channel_id;
   CastSocket* socket = GetSocket(channel_id);
   if (result < 0 || !socket) {
@@ skipping 33 matching lines @@
   } else {
     SetError("Unable to get logs.");
   }
 
   api_->GetLogger()->Reset();
 
   AsyncWorkCompleted();
 }
 
 }  // namespace extensions