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

extensions/browser/api/cast_channel/cast_socket.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_socket.h"
 
 #include <stdlib.h>
 #include <string.h>
 
 #include "base/bind.h"
@@ skipping 35 matching lines @@
 // The default keepalive delay.  On Linux, keepalives probes will be sent after
 // the socket is idle for this length of time, and the socket will be closed
 // after 9 failed probes.  So the total idle time before close is 10 *
 // kTcpKeepAliveDelaySecs.
 const int kTcpKeepAliveDelaySecs = 10;
 }  // namespace
 
 namespace extensions {
 
 static base::LazyInstance<BrowserContextKeyedAPIFactory<
-    ApiResourceManager<core_api::cast_channel::CastSocket> > > g_factory =
+    ApiResourceManager<core_api::cast_channel::CastSocketImpl> > > g_factory =
     LAZY_INSTANCE_INITIALIZER;
 
 // static
 template <>
 BrowserContextKeyedAPIFactory<
-    ApiResourceManager<core_api::cast_channel::CastSocket> >*
-ApiResourceManager<core_api::cast_channel::CastSocket>::GetFactoryInstance() {
+    ApiResourceManager<core_api::cast_channel::CastSocketImpl> >*
+ApiResourceManager<
+    core_api::cast_channel::CastSocketImpl>::GetFactoryInstance() {
   return g_factory.Pointer();
 }
 
 namespace core_api {
 namespace cast_channel {
 
 namespace {
 
 proto::ReadyState ReadyStateToProto(ReadyState state) {
   switch (state) {
     case READY_STATE_NONE:
       return proto::READY_STATE_NONE;
     case READY_STATE_CONNECTING:
       return proto::READY_STATE_CONNECTING;
     case READY_STATE_OPEN:
       return proto::READY_STATE_OPEN;
     case READY_STATE_CLOSING:
       return proto::READY_STATE_CLOSING;
     case READY_STATE_CLOSED:
       return proto::READY_STATE_CLOSED;
     default:
       NOTREACHED();
       return proto::READY_STATE_NONE;
   }
 }
 
-proto::ConnectionState ConnectStateToProto(CastSocket::ConnectionState state) {
+proto::ConnectionState ConnectStateToProto(
+    CastSocketImpl::ConnectionState state) {
   switch (state) {
-    case CastSocket::CONN_STATE_NONE:
+    case CastSocketImpl::CONN_STATE_NONE:
       return proto::CONN_STATE_NONE;
-    case CastSocket::CONN_STATE_TCP_CONNECT:
+    case CastSocketImpl::CONN_STATE_TCP_CONNECT:
       return proto::CONN_STATE_TCP_CONNECT;
-    case CastSocket::CONN_STATE_TCP_CONNECT_COMPLETE:
+    case CastSocketImpl::CONN_STATE_TCP_CONNECT_COMPLETE:
       return proto::CONN_STATE_TCP_CONNECT_COMPLETE;
-    case CastSocket::CONN_STATE_SSL_CONNECT:
+    case CastSocketImpl::CONN_STATE_SSL_CONNECT:
       return proto::CONN_STATE_SSL_CONNECT;
-    case CastSocket::CONN_STATE_SSL_CONNECT_COMPLETE:
+    case CastSocketImpl::CONN_STATE_SSL_CONNECT_COMPLETE:
       return proto::CONN_STATE_SSL_CONNECT_COMPLETE;
-    case CastSocket::CONN_STATE_AUTH_CHALLENGE_SEND:
+    case CastSocketImpl::CONN_STATE_AUTH_CHALLENGE_SEND:
       return proto::CONN_STATE_AUTH_CHALLENGE_SEND;
-    case CastSocket::CONN_STATE_AUTH_CHALLENGE_SEND_COMPLETE:
+    case CastSocketImpl::CONN_STATE_AUTH_CHALLENGE_SEND_COMPLETE:
       return proto::CONN_STATE_AUTH_CHALLENGE_SEND_COMPLETE;
-    case CastSocket::CONN_STATE_AUTH_CHALLENGE_REPLY_COMPLETE:
+    case CastSocketImpl::CONN_STATE_AUTH_CHALLENGE_REPLY_COMPLETE:
       return proto::CONN_STATE_AUTH_CHALLENGE_REPLY_COMPLETE;
     default:
       NOTREACHED();
       return proto::CONN_STATE_NONE;
   }
 }
 
-proto::ReadState ReadStateToProto(CastSocket::ReadState state) {
+proto::ReadState ReadStateToProto(CastSocketImpl::ReadState state) {
   switch (state) {
-    case CastSocket::READ_STATE_NONE:
+    case CastSocketImpl::READ_STATE_NONE:
       return proto::READ_STATE_NONE;
-    case CastSocket::READ_STATE_READ:
+    case CastSocketImpl::READ_STATE_READ:
       return proto::READ_STATE_READ;
-    case CastSocket::READ_STATE_READ_COMPLETE:
+    case CastSocketImpl::READ_STATE_READ_COMPLETE:
       return proto::READ_STATE_READ_COMPLETE;
-    case CastSocket::READ_STATE_DO_CALLBACK:
+    case CastSocketImpl::READ_STATE_DO_CALLBACK:
       return proto::READ_STATE_DO_CALLBACK;
-    case CastSocket::READ_STATE_ERROR:
+    case CastSocketImpl::READ_STATE_ERROR:
       return proto::READ_STATE_ERROR;
     default:
       NOTREACHED();
       return proto::READ_STATE_NONE;
   }
 }
 
-proto::WriteState WriteStateToProto(CastSocket::WriteState state) {
+proto::WriteState WriteStateToProto(CastSocketImpl::WriteState state) {
   switch (state) {
-    case CastSocket::WRITE_STATE_NONE:
+    case CastSocketImpl::WRITE_STATE_NONE:
       return proto::WRITE_STATE_NONE;
-    case CastSocket::WRITE_STATE_WRITE:
+    case CastSocketImpl::WRITE_STATE_WRITE:
       return proto::WRITE_STATE_WRITE;
-    case CastSocket::WRITE_STATE_WRITE_COMPLETE:
+    case CastSocketImpl::WRITE_STATE_WRITE_COMPLETE:
       return proto::WRITE_STATE_WRITE_COMPLETE;
-    case CastSocket::WRITE_STATE_DO_CALLBACK:
+    case CastSocketImpl::WRITE_STATE_DO_CALLBACK:
       return proto::WRITE_STATE_DO_CALLBACK;
-    case CastSocket::WRITE_STATE_ERROR:
+    case CastSocketImpl::WRITE_STATE_ERROR:
       return proto::WRITE_STATE_ERROR;
     default:
       NOTREACHED();
       return proto::WRITE_STATE_NONE;
   }
 }
 
 proto::ErrorState ErrorStateToProto(ChannelError state) {
   switch (state) {
     case CHANNEL_ERROR_NONE:
@@ skipping 17 matching lines @@
     case CHANNEL_ERROR_UNKNOWN:
       return proto::CHANNEL_ERROR_UNKNOWN;
     default:
       NOTREACHED();
       return proto::CHANNEL_ERROR_NONE;
   }
 }
 
 }  // namespace
 
-CastSocket::CastSocket(const std::string& owner_extension_id,
-                       const net::IPEndPoint& ip_endpoint,
-                       ChannelAuthType channel_auth,
-                       CastSocket::Delegate* delegate,
-                       net::NetLog* net_log,
-                       const base::TimeDelta& timeout,
-                       const scoped_refptr<Logger>& logger)
+CastSocketImpl::CastSocketImpl(const std::string& owner_extension_id,
+                               const net::IPEndPoint& ip_endpoint,
+                               ChannelAuthType channel_auth,
+                               CastSocketImpl::Delegate* delegate,
+                               net::NetLog* net_log,
+                               const base::TimeDelta& timeout,
+                               const scoped_refptr<Logger>& logger)
     : ApiResource(owner_extension_id),
       channel_id_(0),
       ip_endpoint_(ip_endpoint),
       channel_auth_(channel_auth),
       delegate_(delegate),
       net_log_(net_log),
       logger_(logger),
       connect_timeout_(timeout),
-      connect_timeout_timer_(new base::OneShotTimer<CastSocket>),
+      connect_timeout_timer_(new base::OneShotTimer<CastSocketImpl>),
       is_canceled_(false),
       connect_state_(CONN_STATE_NONE),
       write_state_(WRITE_STATE_NONE),
       read_state_(READ_STATE_NONE),
       error_state_(CHANNEL_ERROR_NONE),
       ready_state_(READY_STATE_NONE) {
   DCHECK(net_log_);
   DCHECK(channel_auth_ == CHANNEL_AUTH_TYPE_SSL ||
          channel_auth_ == CHANNEL_AUTH_TYPE_SSL_VERIFIED);
   net_log_source_.type = net::NetLog::SOURCE_SOCKET;
   net_log_source_.id = net_log_->NextID();
 
   // Buffer is reused across messages.
   read_buffer_ = new net::GrowableIOBuffer();
   read_buffer_->SetCapacity(MessageFramer::MessageHeader::max_message_size());
   framer_.reset(new MessageFramer(read_buffer_));
 }
 
-CastSocket::~CastSocket() {
+CastSocketImpl::~CastSocketImpl() {
   // Ensure that resources are freed but do not run pending callbacks to avoid
   // any re-entrancy.
   CloseInternal();
 }
 
-ReadyState CastSocket::ready_state() const {
+ReadyState CastSocketImpl::ready_state() const {
   return ready_state_;
 }
 
-ChannelError CastSocket::error_state() const {
+ChannelError CastSocketImpl::error_state() const {
   return error_state_;
 }
 
-scoped_ptr<net::TCPClientSocket> CastSocket::CreateTcpSocket() {
+scoped_ptr<net::TCPClientSocket> CastSocketImpl::CreateTcpSocket() {
   net::AddressList addresses(ip_endpoint_);
   return scoped_ptr<net::TCPClientSocket>(
       new net::TCPClientSocket(addresses, net_log_, net_log_source_));
   // Options cannot be set on the TCPClientSocket yet, because the
   // underlying platform socket will not be created until Bind()
   // or Connect() is called.
 }
 
-scoped_ptr<net::SSLClientSocket> CastSocket::CreateSslSocket(
+scoped_ptr<net::SSLClientSocket> CastSocketImpl::CreateSslSocket(
     scoped_ptr<net::StreamSocket> socket) {
   net::SSLConfig ssl_config;
   // If a peer cert was extracted in a previous attempt to connect, then
   // whitelist that cert.
   if (!peer_cert_.empty()) {
     net::SSLConfig::CertAndStatus cert_and_status;
     cert_and_status.cert_status = net::CERT_STATUS_AUTHORITY_INVALID;
     cert_and_status.der_cert = peer_cert_;
     ssl_config.allowed_bad_certs.push_back(cert_and_status);
     logger_->LogSocketEvent(channel_id_, proto::SSL_CERT_WHITELISTED);
   }
 
   cert_verifier_.reset(net::CertVerifier::CreateDefault());
   transport_security_state_.reset(new net::TransportSecurityState);
   net::SSLClientSocketContext context;
   // CertVerifier and TransportSecurityState are owned by us, not the
   // context object.
   context.cert_verifier = cert_verifier_.get();
   context.transport_security_state = transport_security_state_.get();
 
   scoped_ptr<net::ClientSocketHandle> connection(new net::ClientSocketHandle);
   connection->SetSocket(socket.Pass());
   net::HostPortPair host_and_port = net::HostPortPair::FromIPEndPoint(
       ip_endpoint_);
 
   return net::ClientSocketFactory::GetDefaultFactory()->CreateSSLClientSocket(
       connection.Pass(), host_and_port, ssl_config, context);
 }
 
-bool CastSocket::ExtractPeerCert(std::string* cert) {
+bool CastSocketImpl::ExtractPeerCert(std::string* cert) {
   DCHECK(cert);
   DCHECK(peer_cert_.empty());
   net::SSLInfo ssl_info;
   if (!socket_->GetSSLInfo(&ssl_info) || !ssl_info.cert.get()) {
     return false;
   }
 
   logger_->LogSocketEvent(channel_id_, proto::SSL_INFO_OBTAINED);
 
   bool result = net::X509Certificate::GetDEREncoded(
      ssl_info.cert->os_cert_handle(), cert);
   if (result) {
     VLOG_WITH_CONNECTION(1) << "Successfully extracted peer certificate: "
                             << *cert;
   }
 
   logger_->LogSocketEventWithRv(
       channel_id_, proto::DER_ENCODED_CERT_OBTAIN, result ? 1 : 0);
   return result;
 }
 
-bool CastSocket::VerifyChallengeReply() {
+bool CastSocketImpl::VerifyChallengeReply() {
   AuthResult result = AuthenticateChallengeReply(*challenge_reply_, peer_cert_);
   logger_->LogSocketChallengeReplyEvent(channel_id_, result);
   return result.success();
 }
 
-void CastSocket::Connect(const net::CompletionCallback& callback) {
+void CastSocketImpl::Connect(const net::CompletionCallback& callback) {
   DCHECK(CalledOnValidThread());
   VLOG_WITH_CONNECTION(1) << "Connect readyState = " << ready_state_;
   if (ready_state_ != READY_STATE_NONE) {
     logger_->LogSocketEventWithDetails(
         channel_id_, proto::CONNECT_FAILED, "ReadyState not NONE");
     callback.Run(net::ERR_CONNECTION_FAILED);
     return;
   }
 
   connect_callback_ = callback;
   SetReadyState(READY_STATE_CONNECTING);
   SetConnectState(CONN_STATE_TCP_CONNECT);
 
   if (connect_timeout_.InMicroseconds() > 0) {
     DCHECK(connect_timeout_callback_.IsCancelled());
     connect_timeout_callback_.Reset(
-        base::Bind(&CastSocket::OnConnectTimeout, base::Unretained(this)));
+        base::Bind(&CastSocketImpl::OnConnectTimeout, base::Unretained(this)));
     GetTimer()->Start(FROM_HERE,
                       connect_timeout_,
                       connect_timeout_callback_.callback());
   }
   DoConnectLoop(net::OK);
 }
 
-void CastSocket::PostTaskToStartConnectLoop(int result) {
+void CastSocketImpl::PostTaskToStartConnectLoop(int result) {
   DCHECK(CalledOnValidThread());
   DCHECK(connect_loop_callback_.IsCancelled());
-  connect_loop_callback_.Reset(base::Bind(&CastSocket::DoConnectLoop,
-                                          base::Unretained(this),
-                                          result));
+  connect_loop_callback_.Reset(base::Bind(
+      &CastSocketImpl::DoConnectLoop, base::Unretained(this), result));
   base::MessageLoop::current()->PostTask(FROM_HERE,
                                          connect_loop_callback_.callback());
 }
 
-void CastSocket::OnConnectTimeout() {
+void CastSocketImpl::OnConnectTimeout() {
   DCHECK(CalledOnValidThread());
   // Stop all pending connection setup tasks and report back to the client.
   is_canceled_ = true;
   logger_->LogSocketEvent(channel_id_, proto::CONNECT_TIMED_OUT);
   VLOG_WITH_CONNECTION(1) << "Timeout while establishing a connection.";
   DoConnectCallback(net::ERR_TIMED_OUT);
 }
 
 // This method performs the state machine transitions for connection flow.
 // There are two entry points to this method:
 // 1. Connect method: this starts the flow
 // 2. Callback from network operations that finish asynchronously
-void CastSocket::DoConnectLoop(int result) {
+void CastSocketImpl::DoConnectLoop(int result) {
   connect_loop_callback_.Cancel();
   if (is_canceled_) {
     LOG(ERROR) << "CANCELLED - Aborting DoConnectLoop.";
     return;
   }
   // Network operations can either finish synchronously or asynchronously.
   // This method executes the state machine transitions in a loop so that
   // correct state transitions happen even when network operations finish
   // synchronously.
   int rv = result;
@@ skipping 41 matching lines @@
                                    ConnectStateToProto(connect_state_));
   }
 
   // Connect loop is finished: if there is no pending IO invoke the callback.
   if (rv != net::ERR_IO_PENDING) {
     GetTimer()->Stop();
     DoConnectCallback(rv);
   }
 }
 
-int CastSocket::DoTcpConnect() {
+int CastSocketImpl::DoTcpConnect() {
   DCHECK(connect_loop_callback_.IsCancelled());
   VLOG_WITH_CONNECTION(1) << "DoTcpConnect";
   SetConnectState(CONN_STATE_TCP_CONNECT_COMPLETE);
   tcp_socket_ = CreateTcpSocket();
 
   int rv = tcp_socket_->Connect(
-      base::Bind(&CastSocket::DoConnectLoop, base::Unretained(this)));
+      base::Bind(&CastSocketImpl::DoConnectLoop, base::Unretained(this)));
   logger_->LogSocketEventWithRv(channel_id_, proto::TCP_SOCKET_CONNECT, rv);
   return rv;
 }
 
-int CastSocket::DoTcpConnectComplete(int result) {
+int CastSocketImpl::DoTcpConnectComplete(int result) {
   VLOG_WITH_CONNECTION(1) << "DoTcpConnectComplete: " << result;
   if (result == net::OK) {
     // Enable TCP protocol-level keep-alive.
     bool result = tcp_socket_->SetKeepAlive(true, kTcpKeepAliveDelaySecs);
     LOG_IF(WARNING, !result) << "Failed to SetKeepAlive.";
     logger_->LogSocketEventWithRv(
         channel_id_, proto::TCP_SOCKET_SET_KEEP_ALIVE, result ? 1 : 0);
     SetConnectState(CONN_STATE_SSL_CONNECT);
   }
   return result;
 }
 
-int CastSocket::DoSslConnect() {
+int CastSocketImpl::DoSslConnect() {
   DCHECK(connect_loop_callback_.IsCancelled());
   VLOG_WITH_CONNECTION(1) << "DoSslConnect";
   SetConnectState(CONN_STATE_SSL_CONNECT_COMPLETE);
   socket_ = CreateSslSocket(tcp_socket_.PassAs<net::StreamSocket>());
 
   int rv = socket_->Connect(
-      base::Bind(&CastSocket::DoConnectLoop, base::Unretained(this)));
+      base::Bind(&CastSocketImpl::DoConnectLoop, base::Unretained(this)));
   logger_->LogSocketEventWithRv(channel_id_, proto::SSL_SOCKET_CONNECT, rv);
   return rv;
 }
 
-int CastSocket::DoSslConnectComplete(int result) {
+int CastSocketImpl::DoSslConnectComplete(int result) {
   VLOG_WITH_CONNECTION(1) << "DoSslConnectComplete: " << result;
   if (result == net::ERR_CERT_AUTHORITY_INVALID &&
       peer_cert_.empty() && ExtractPeerCert(&peer_cert_)) {
     SetConnectState(CONN_STATE_TCP_CONNECT);
   } else if (result == net::OK &&
              channel_auth_ == CHANNEL_AUTH_TYPE_SSL_VERIFIED) {
     SetConnectState(CONN_STATE_AUTH_CHALLENGE_SEND);
   }
   return result;
 }
 
-int CastSocket::DoAuthChallengeSend() {
+int CastSocketImpl::DoAuthChallengeSend() {
   VLOG_WITH_CONNECTION(1) << "DoAuthChallengeSend";
   SetConnectState(CONN_STATE_AUTH_CHALLENGE_SEND_COMPLETE);
 
   CastMessage challenge_message;
   CreateAuthChallengeMessage(&challenge_message);
   VLOG_WITH_CONNECTION(1) << "Sending challenge: "
                           << CastMessageToString(challenge_message);
   // Post a task to send auth challenge so that DoWriteLoop is not nested inside
   // DoConnectLoop. This is not strictly necessary but keeps the write loop
   // code decoupled from connect loop code.
   DCHECK(send_auth_challenge_callback_.IsCancelled());
   send_auth_challenge_callback_.Reset(
-      base::Bind(&CastSocket::SendCastMessageInternal,
+      base::Bind(&CastSocketImpl::SendCastMessageInternal,
                  base::Unretained(this),
                  challenge_message,
-                 base::Bind(&CastSocket::DoAuthChallengeSendWriteComplete,
+                 base::Bind(&CastSocketImpl::DoAuthChallengeSendWriteComplete,
                             base::Unretained(this))));
   base::MessageLoop::current()->PostTask(
       FROM_HERE,
       send_auth_challenge_callback_.callback());
   // Always return IO_PENDING since the result is always asynchronous.
   return net::ERR_IO_PENDING;
 }
 
-void CastSocket::DoAuthChallengeSendWriteComplete(int result) {
+void CastSocketImpl::DoAuthChallengeSendWriteComplete(int result) {
   send_auth_challenge_callback_.Cancel();
   VLOG_WITH_CONNECTION(2) << "DoAuthChallengeSendWriteComplete: " << result;
   DCHECK_GT(result, 0);
   DCHECK_EQ(write_queue_.size(), 1UL);
   PostTaskToStartConnectLoop(result);
 }
 
-int CastSocket::DoAuthChallengeSendComplete(int result) {
+int CastSocketImpl::DoAuthChallengeSendComplete(int result) {
   VLOG_WITH_CONNECTION(1) << "DoAuthChallengeSendComplete: " << result;
   if (result < 0) {
     return result;
   }
   SetConnectState(CONN_STATE_AUTH_CHALLENGE_REPLY_COMPLETE);
 
   // Post a task to start read loop so that DoReadLoop is not nested inside
   // DoConnectLoop. This is not strictly necessary but keeps the read loop
   // code decoupled from connect loop code.
   PostTaskToStartReadLoop();
   // Always return IO_PENDING since the result is always asynchronous.
   return net::ERR_IO_PENDING;
 }
 
-int CastSocket::DoAuthChallengeReplyComplete(int result) {
+int CastSocketImpl::DoAuthChallengeReplyComplete(int result) {
   VLOG_WITH_CONNECTION(1) << "DoAuthChallengeReplyComplete: " << result;
   if (result < 0) {
     return result;
   }
   if (!VerifyChallengeReply()) {
     return net::ERR_FAILED;
   }
   VLOG_WITH_CONNECTION(1) << "Auth challenge verification succeeded";
   return net::OK;
 }
 
-void CastSocket::DoConnectCallback(int result) {
+void CastSocketImpl::DoConnectCallback(int result) {
   SetReadyState((result == net::OK) ? READY_STATE_OPEN : READY_STATE_CLOSED);
   if (result == net::OK) {
     SetErrorState(CHANNEL_ERROR_NONE);
     PostTaskToStartReadLoop();
     VLOG_WITH_CONNECTION(1) << "Calling Connect_Callback";
     base::ResetAndReturn(&connect_callback_).Run(result);
     return;
   } else if (result == net::ERR_TIMED_OUT) {
     SetErrorState(CHANNEL_ERROR_CONNECT_TIMEOUT);
   } else {
     SetErrorState(CHANNEL_ERROR_CONNECT_ERROR);
   }
   // Calls the connect callback.
   CloseWithError();
 }
 
-void CastSocket::Close(const net::CompletionCallback& callback) {
+void CastSocketImpl::Close(const net::CompletionCallback& callback) {
   CloseInternal();
   RunPendingCallbacksOnClose();
   // Run this callback last.  It may delete the socket.
   callback.Run(net::OK);
 }
 
-void CastSocket::CloseInternal() {
+void CastSocketImpl::CloseInternal() {
   // TODO(mfoltz): Enforce this when CastChannelAPITest is rewritten to create
   // and free sockets on the same thread.  crbug.com/398242
   // DCHECK(CalledOnValidThread());
   if (ready_state_ == READY_STATE_CLOSED) {
     return;
   }
 
   VLOG_WITH_CONNECTION(1) << "Close ReadyState = " << ready_state_;
   tcp_socket_.reset();
   socket_.reset();
   cert_verifier_.reset();
   transport_security_state_.reset();
   GetTimer()->Stop();
 
   // Cancel callbacks that we queued ourselves to re-enter the connect or read
   // loops.
   connect_loop_callback_.Cancel();
   send_auth_challenge_callback_.Cancel();
   read_loop_callback_.Cancel();
   connect_timeout_callback_.Cancel();
   SetReadyState(READY_STATE_CLOSED);
   logger_->LogSocketEvent(channel_id_, proto::SOCKET_CLOSED);
 }
 
-void CastSocket::RunPendingCallbacksOnClose() {
+void CastSocketImpl::RunPendingCallbacksOnClose() {
   DCHECK_EQ(ready_state_, READY_STATE_CLOSED);
   if (!connect_callback_.is_null()) {
     connect_callback_.Run(net::ERR_CONNECTION_FAILED);
     connect_callback_.Reset();
   }
   for (; !write_queue_.empty(); write_queue_.pop()) {
     net::CompletionCallback& callback = write_queue_.front().callback;
     callback.Run(net::ERR_FAILED);
     callback.Reset();
   }
 }
 
-void CastSocket::SendMessage(const MessageInfo& message,
-                             const net::CompletionCallback& callback) {
+void CastSocketImpl::SendMessage(const MessageInfo& message,
+                                 const net::CompletionCallback& callback) {
   DCHECK(CalledOnValidThread());
   if (ready_state_ != READY_STATE_OPEN) {
     logger_->LogSocketEventForMessage(channel_id_,
                                       proto::SEND_MESSAGE_FAILED,
                                       message.namespace_,
                                       "Ready state not OPEN");
     callback.Run(net::ERR_FAILED);
     return;
   }
   CastMessage message_proto;
   if (!MessageInfoToCastMessage(message, &message_proto)) {
     logger_->LogSocketEventForMessage(channel_id_,
                                       proto::SEND_MESSAGE_FAILED,
                                       message.namespace_,
                                       "Failed to convert to CastMessage");
     callback.Run(net::ERR_FAILED);
     return;
   }
   SendCastMessageInternal(message_proto, callback);
 }
 
-void CastSocket::SendCastMessageInternal(
+void CastSocketImpl::SendCastMessageInternal(
     const CastMessage& message,
     const net::CompletionCallback& callback) {
   WriteRequest write_request(callback);
   if (!write_request.SetContent(message)) {
     logger_->LogSocketEventForMessage(channel_id_,
                                       proto::SEND_MESSAGE_FAILED,
                                       message.namespace_(),
                                       "SetContent failed");
     callback.Run(net::ERR_FAILED);
     return;
   }
 
   write_queue_.push(write_request);
   logger_->LogSocketEventForMessage(
       channel_id_,
       proto::MESSAGE_ENQUEUED,
       message.namespace_(),
       base::StringPrintf("Queue size: %" PRIuS, write_queue_.size()));
   if (write_state_ == WRITE_STATE_NONE) {
     SetWriteState(WRITE_STATE_WRITE);
     DoWriteLoop(net::OK);
   }
 }
 
-void CastSocket::DoWriteLoop(int result) {
+void CastSocketImpl::DoWriteLoop(int result) {
   DCHECK(CalledOnValidThread());
   VLOG_WITH_CONNECTION(1) << "DoWriteLoop queue size: " << write_queue_.size();
 
   if (write_queue_.empty()) {
     SetWriteState(WRITE_STATE_NONE);
     return;
   }
 
   // Network operations can either finish synchronously or asynchronously.
   // This method executes the state machine transitions in a loop so that
@@ skipping 35 matching lines @@
   if (write_queue_.empty()) {
     SetWriteState(WRITE_STATE_NONE);
   }
 
   // Write loop is done - if the result is ERR_FAILED then close with error.
   if (rv == net::ERR_FAILED) {
     CloseWithError();
   }
 }
 
-int CastSocket::DoWrite() {
+int CastSocketImpl::DoWrite() {
   DCHECK(!write_queue_.empty());
   WriteRequest& request = write_queue_.front();
 
   VLOG_WITH_CONNECTION(2) << "WriteData byte_count = "
                           << request.io_buffer->size() << " bytes_written "
                           << request.io_buffer->BytesConsumed();
 
   SetWriteState(WRITE_STATE_WRITE_COMPLETE);
 
   int rv = socket_->Write(
       request.io_buffer.get(),
       request.io_buffer->BytesRemaining(),
-      base::Bind(&CastSocket::DoWriteLoop, base::Unretained(this)));
+      base::Bind(&CastSocketImpl::DoWriteLoop, base::Unretained(this)));
   logger_->LogSocketEventWithRv(channel_id_, proto::SOCKET_WRITE, rv);
 
   return rv;
 }
 
-int CastSocket::DoWriteComplete(int result) {
+int CastSocketImpl::DoWriteComplete(int result) {
   DCHECK(!write_queue_.empty());
   if (result <= 0) {  // NOTE that 0 also indicates an error
     SetErrorState(CHANNEL_ERROR_SOCKET_ERROR);
     SetWriteState(WRITE_STATE_ERROR);
     return result == 0 ? net::ERR_FAILED : result;
   }
 
   // Some bytes were successfully written
   WriteRequest& request = write_queue_.front();
   scoped_refptr<net::DrainableIOBuffer> io_buffer = request.io_buffer;
   io_buffer->DidConsume(result);
   if (io_buffer->BytesRemaining() == 0) {  // Message fully sent
     SetWriteState(WRITE_STATE_DO_CALLBACK);
   } else {
     SetWriteState(WRITE_STATE_WRITE);
   }
 
   return net::OK;
 }
 
-int CastSocket::DoWriteCallback() {
+int CastSocketImpl::DoWriteCallback() {
   DCHECK(!write_queue_.empty());
 
   SetWriteState(WRITE_STATE_WRITE);
 
   WriteRequest& request = write_queue_.front();
   int bytes_consumed = request.io_buffer->BytesConsumed();
   logger_->LogSocketEventForMessage(
       channel_id_,
       proto::MESSAGE_WRITTEN,
       request.message_namespace,
       base::StringPrintf("Bytes: %d", bytes_consumed));
   request.callback.Run(bytes_consumed);
   write_queue_.pop();
   return net::OK;
 }
 
-int CastSocket::DoWriteError(int result) {
+int CastSocketImpl::DoWriteError(int result) {
   DCHECK(!write_queue_.empty());
   DCHECK_LT(result, 0);
 
   // If inside connection flow, then there should be exactly one item in
   // the write queue.
   if (ready_state_ == READY_STATE_CONNECTING) {
     write_queue_.pop();
     DCHECK(write_queue_.empty());
     PostTaskToStartConnectLoop(result);
     // Connect loop will handle the error. Return net::OK so that write flow
     // does not try to report error also.
     return net::OK;
   }
 
   while (!write_queue_.empty()) {
     WriteRequest& request = write_queue_.front();
     request.callback.Run(result);
     write_queue_.pop();
   }
   return net::ERR_FAILED;
 }
 
-void CastSocket::PostTaskToStartReadLoop() {
+void CastSocketImpl::PostTaskToStartReadLoop() {
   DCHECK(CalledOnValidThread());
   DCHECK(read_loop_callback_.IsCancelled());
-  read_loop_callback_.Reset(base::Bind(&CastSocket::StartReadLoop,
-                                       base::Unretained(this)));
+  read_loop_callback_.Reset(
+      base::Bind(&CastSocketImpl::StartReadLoop, base::Unretained(this)));
   base::MessageLoop::current()->PostTask(FROM_HERE,
                                          read_loop_callback_.callback());
 }
 
-void CastSocket::StartReadLoop() {
+void CastSocketImpl::StartReadLoop() {
   read_loop_callback_.Cancel();
   // Read loop would have already been started if read state is not NONE
   if (read_state_ == READ_STATE_NONE) {
     SetReadState(READ_STATE_READ);
     DoReadLoop(net::OK);
   }
 }
 
-void CastSocket::DoReadLoop(int result) {
+void CastSocketImpl::DoReadLoop(int result) {
   DCHECK(CalledOnValidThread());
   // Network operations can either finish synchronously or asynchronously.
   // This method executes the state machine transitions in a loop so that
   // write state transitions happen even when network operations finish
   // synchronously.
   int rv = result;
   do {
     ReadState state = read_state_;
     read_state_ = READ_STATE_NONE;
 
@@ skipping 30 matching lines @@
       // delegate.
       PostTaskToStartConnectLoop(net::ERR_FAILED);
     } else {
       // Connection is already established.  Close and send error status via the
       // OnError delegate.
       CloseWithError();
     }
   }
 }
 
-int CastSocket::DoRead() {
+int CastSocketImpl::DoRead() {
   SetReadState(READ_STATE_READ_COMPLETE);
 
   // Determine how many bytes need to be read.
   size_t num_bytes_to_read = framer_->BytesRequested();
 
   // Read up to num_bytes_to_read into |current_read_buffer_|.
   int rv = socket_->Read(
       read_buffer_.get(),
       base::checked_cast<uint32>(num_bytes_to_read),
-      base::Bind(&CastSocket::DoReadLoop, base::Unretained(this)));
+      base::Bind(&CastSocketImpl::DoReadLoop, base::Unretained(this)));
   logger_->LogSocketEventWithRv(channel_id_, proto::SOCKET_READ, rv);
 
   return rv;
 }
 
-int CastSocket::DoReadComplete(int result) {
+int CastSocketImpl::DoReadComplete(int result) {
   VLOG_WITH_CONNECTION(2) << "DoReadComplete result = " << result;
 
   if (result <= 0) {  // 0 means EOF: the peer closed the socket
     VLOG_WITH_CONNECTION(1) << "Read error, peer closed the socket";
     SetErrorState(CHANNEL_ERROR_SOCKET_ERROR);
     SetReadState(READ_STATE_ERROR);
     return result == 0 ? net::ERR_FAILED : result;
   }
 
   size_t message_size;
@@ skipping 12 matching lines @@
   } else if (error_state_ != CHANNEL_ERROR_NONE) {
     DCHECK(current_message_.get() == NULL);
     SetReadState(READ_STATE_ERROR);
   } else {
     DCHECK(current_message_.get() == NULL);
     SetReadState(READ_STATE_READ);
   }
   return net::OK;
 }
 
-int CastSocket::DoReadCallback() {
+int CastSocketImpl::DoReadCallback() {
   SetReadState(READ_STATE_READ);
   const CastMessage& message = *current_message_;
   if (ready_state_ == READY_STATE_CONNECTING) {
     if (IsAuthMessage(message)) {
       challenge_reply_.reset(new CastMessage(message));
       logger_->LogSocketEvent(channel_id_, proto::RECEIVED_CHALLENGE_REPLY);
       PostTaskToStartConnectLoop(net::OK);
       current_message_.reset();
       return net::OK;
     } else {
@@ skipping 15 matching lines @@
   logger_->LogSocketEventForMessage(channel_id_,
                                     proto::NOTIFY_ON_MESSAGE,
                                     message.namespace_(),
                                     std::string());
   delegate_->OnMessage(this, message_info);
   current_message_.reset();
 
   return net::OK;
 }
 
-int CastSocket::DoReadError(int result) {
+int CastSocketImpl::DoReadError(int result) {
   DCHECK_LE(result, 0);
   return net::ERR_FAILED;
 }
 
-void CastSocket::CloseWithError() {
+void CastSocketImpl::CloseWithError() {
   DCHECK(CalledOnValidThread());
   CloseInternal();
   RunPendingCallbacksOnClose();
   if (delegate_) {
     logger_->LogSocketEvent(channel_id_, proto::NOTIFY_ON_ERROR);
     delegate_->OnError(this, error_state_, logger_->GetLastErrors(channel_id_));
   }
 }
 
-std::string CastSocket::CastUrl() const {
+std::string CastSocketImpl::CastUrl() const {
   return ((channel_auth_ == CHANNEL_AUTH_TYPE_SSL_VERIFIED) ?
           "casts://" : "cast://") + ip_endpoint_.ToString();
 }
 
-bool CastSocket::CalledOnValidThread() const {
+bool CastSocketImpl::CalledOnValidThread() const {
   return thread_checker_.CalledOnValidThread();
 }
 
-base::Timer* CastSocket::GetTimer() {
+base::Timer* CastSocketImpl::GetTimer() {
   return connect_timeout_timer_.get();
 }
 
-void CastSocket::SetConnectState(ConnectionState connect_state) {
+void CastSocketImpl::SetConnectState(ConnectionState connect_state) {
   if (connect_state_ != connect_state) {
     connect_state_ = connect_state;
     logger_->LogSocketConnectState(channel_id_,
                                    ConnectStateToProto(connect_state_));
   }
 }
 
-void CastSocket::SetReadyState(ReadyState ready_state) {
+void CastSocketImpl::SetReadyState(ReadyState ready_state) {
   if (ready_state_ != ready_state) {
     ready_state_ = ready_state;
     logger_->LogSocketReadyState(channel_id_, ReadyStateToProto(ready_state_));
   }
 }
 
-void CastSocket::SetErrorState(ChannelError error_state) {
+void CastSocketImpl::SetErrorState(ChannelError error_state) {
   if (error_state_ != error_state) {
     error_state_ = error_state;
     logger_->LogSocketErrorState(channel_id_, ErrorStateToProto(error_state_));
   }
 }
 
-void CastSocket::SetReadState(ReadState read_state) {
+void CastSocketImpl::SetReadState(ReadState read_state) {
   if (read_state_ != read_state) {
     read_state_ = read_state;
     logger_->LogSocketReadState(channel_id_, ReadStateToProto(read_state_));
   }
 }
 
-void CastSocket::SetWriteState(WriteState write_state) {
+void CastSocketImpl::SetWriteState(WriteState write_state) {
   if (write_state_ != write_state) {
     write_state_ = write_state;
     logger_->LogSocketWriteState(channel_id_, WriteStateToProto(write_state_));
   }
 }
 
-CastSocket::WriteRequest::WriteRequest(const net::CompletionCallback& callback)
-  : callback(callback) { }
+CastSocketImpl::WriteRequest::WriteRequest(
+    const net::CompletionCallback& callback)
+    : callback(callback) {
+}
 
-bool CastSocket::WriteRequest::SetContent(const CastMessage& message_proto) {
+bool CastSocketImpl::WriteRequest::SetContent(
+    const CastMessage& message_proto) {
   DCHECK(!io_buffer.get());
   std::string message_data;
   if (!MessageFramer::Serialize(message_proto, &message_data)) {
     return false;
   }
   message_namespace = message_proto.namespace_();
   io_buffer = new net::DrainableIOBuffer(new net::StringIOBuffer(message_data),
                                          message_data.size());
   return true;
 }
 
-CastSocket::WriteRequest::~WriteRequest() { }
+CastSocketImpl::WriteRequest::~WriteRequest() {
+}
 }  // namespace cast_channel
 }  // namespace core_api
 }  // namespace extensions
 
 #undef VLOG_WITH_CONNECTION