| Index: components/cast_channel/cast_transport.cc
|
| diff --git a/extensions/browser/api/cast_channel/cast_transport.cc b/components/cast_channel/cast_transport.cc
|
| similarity index 94%
|
| rename from extensions/browser/api/cast_channel/cast_transport.cc
|
| rename to components/cast_channel/cast_transport.cc
|
| index ce2ef7d4dd3d4143c5c2782caa75014a361f33b5..d5ab894d97ad13c9892a16786d0ef665e9153bb6 100644
|
| --- a/extensions/browser/api/cast_channel/cast_transport.cc
|
| +++ b/components/cast_channel/cast_transport.cc
|
| @@ -2,7 +2,7 @@
|
| // 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_transport.h"
|
| +#include "components/cast_channel/cast_transport.h"
|
|
|
| #include <stddef.h>
|
| #include <stdint.h>
|
| @@ -17,10 +17,10 @@
|
| #include "base/single_thread_task_runner.h"
|
| #include "base/strings/stringprintf.h"
|
| #include "base/threading/thread_task_runner_handle.h"
|
| -#include "extensions/browser/api/cast_channel/cast_framer.h"
|
| -#include "extensions/browser/api/cast_channel/cast_message_util.h"
|
| -#include "extensions/browser/api/cast_channel/logger.h"
|
| -#include "extensions/common/api/cast_channel/cast_channel.pb.h"
|
| +#include "components/cast_channel/cast_framer.h"
|
| +#include "components/cast_channel/cast_message_util.h"
|
| +#include "components/cast_channel/logger.h"
|
| +#include "components/cast_channel/proto/cast_channel.pb.h"
|
| #include "net/base/net_errors.h"
|
| #include "net/socket/socket.h"
|
|
|
| @@ -29,8 +29,6 @@
|
| << ::cast_channel::ChannelAuthTypeToString(channel_auth_) \
|
| << "] "
|
|
|
| -namespace extensions {
|
| -namespace api {
|
| namespace cast_channel {
|
|
|
| CastTransportImpl::CastTransportImpl(net::Socket* socket,
|
| @@ -57,7 +55,7 @@ CastTransportImpl::CastTransportImpl(net::Socket* socket,
|
| }
|
|
|
| CastTransportImpl::~CastTransportImpl() {
|
| - DCHECK(CalledOnValidThread());
|
| + DCHECK_CALLED_ON_VALID_THREAD(thread_checker_);
|
| FlushWriteQueue();
|
| }
|
|
|
| @@ -147,7 +145,7 @@ proto::ErrorState CastTransportImpl::ErrorStateToProto(ChannelError state) {
|
| }
|
|
|
| void CastTransportImpl::SetReadDelegate(std::unique_ptr<Delegate> delegate) {
|
| - DCHECK(CalledOnValidThread());
|
| + DCHECK_CALLED_ON_VALID_THREAD(thread_checker_);
|
| DCHECK(delegate);
|
| delegate_ = std::move(delegate);
|
| if (started_) {
|
| @@ -166,15 +164,15 @@ void CastTransportImpl::FlushWriteQueue() {
|
|
|
| void CastTransportImpl::SendMessage(const CastMessage& message,
|
| const net::CompletionCallback& callback) {
|
| - DCHECK(CalledOnValidThread());
|
| + DCHECK_CALLED_ON_VALID_THREAD(thread_checker_);
|
| std::string serialized_message;
|
| if (!MessageFramer::Serialize(message, &serialized_message)) {
|
| base::ThreadTaskRunnerHandle::Get()->PostTask(
|
| FROM_HERE, base::Bind(callback, net::ERR_FAILED));
|
| return;
|
| }
|
| - WriteRequest write_request(
|
| - message.namespace_(), serialized_message, callback);
|
| + WriteRequest write_request(message.namespace_(), serialized_message,
|
| + callback);
|
|
|
| write_queue_.push(write_request);
|
| if (write_state_ == WRITE_STATE_IDLE) {
|
| @@ -196,8 +194,7 @@ CastTransportImpl::WriteRequest::WriteRequest(
|
| CastTransportImpl::WriteRequest::WriteRequest(const WriteRequest& other) =
|
| default;
|
|
|
| -CastTransportImpl::WriteRequest::~WriteRequest() {
|
| -}
|
| +CastTransportImpl::WriteRequest::~WriteRequest() {}
|
|
|
| void CastTransportImpl::SetReadState(ReadState read_state) {
|
| if (read_state_ != read_state)
|
| @@ -216,7 +213,7 @@ void CastTransportImpl::SetErrorState(ChannelError error_state) {
|
| }
|
|
|
| void CastTransportImpl::OnWriteResult(int result) {
|
| - DCHECK(CalledOnValidThread());
|
| + DCHECK_CALLED_ON_VALID_THREAD(thread_checker_);
|
| DCHECK_NE(WRITE_STATE_IDLE, write_state_);
|
| if (write_queue_.empty()) {
|
| SetWriteState(WRITE_STATE_IDLE);
|
| @@ -332,7 +329,7 @@ int CastTransportImpl::DoWriteHandleError(int result) {
|
| }
|
|
|
| void CastTransportImpl::Start() {
|
| - DCHECK(CalledOnValidThread());
|
| + DCHECK_CALLED_ON_VALID_THREAD(thread_checker_);
|
| DCHECK(!started_);
|
| DCHECK_EQ(READ_STATE_READ, read_state_);
|
| DCHECK(delegate_) << "Read delegate must be set prior to calling Start()";
|
| @@ -345,15 +342,15 @@ void CastTransportImpl::Start() {
|
| }
|
|
|
| void CastTransportImpl::OnReadResult(int result) {
|
| - DCHECK(CalledOnValidThread());
|
| + DCHECK_CALLED_ON_VALID_THREAD(thread_checker_);
|
| // 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 {
|
| - VLOG_WITH_CONNECTION(2) << "OnReadResult(state=" << read_state_
|
| - << ", result=" << rv << ")";
|
| + VLOG_WITH_CONNECTION(2)
|
| + << "OnReadResult(state=" << read_state_ << ", result=" << rv << ")";
|
| ReadState state = read_state_;
|
| read_state_ = READ_STATE_UNKNOWN;
|
|
|
| @@ -451,5 +448,3 @@ int CastTransportImpl::DoReadHandleError(int result) {
|
| }
|
|
|
| } // namespace cast_channel
|
| -} // namespace api
|
| -} // namespace extensions
|
|
|