Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(195)

Unified Diff: components/cast_channel/cast_socket.cc

Issue 2913033003: [cast_channel] Move cast_channel related files from //extensions to //components (Closed)
Patch Set: Created 3 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: components/cast_channel/cast_socket.cc
diff --git a/extensions/browser/api/cast_channel/cast_socket.cc b/components/cast_channel/cast_socket.cc
similarity index 96%
rename from extensions/browser/api/cast_channel/cast_socket.cc
rename to components/cast_channel/cast_socket.cc
index cb25862539fe78646410009226394f066d8bc9af..d74592d1ebe1ffb5756d1570b777e1e8c6529f8e 100644
--- a/extensions/browser/api/cast_channel/cast_socket.cc
+++ b/components/cast_channel/cast_socket.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_socket.h"
+#include "components/cast_channel/cast_socket.h"
#include <stdlib.h>
#include <string.h>
@@ -22,12 +22,12 @@
#include "base/sys_byteorder.h"
#include "base/threading/thread_task_runner_handle.h"
#include "base/time/time.h"
-#include "extensions/browser/api/cast_channel/cast_auth_util.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/cast_transport.h"
-#include "extensions/browser/api/cast_channel/logger.h"
-#include "extensions/common/api/cast_channel/cast_channel.pb.h"
+#include "components/cast_channel/cast_auth_util.h"
+#include "components/cast_channel/cast_framer.h"
+#include "components/cast_channel/cast_message_util.h"
+#include "components/cast_channel/cast_transport.h"
+#include "components/cast_channel/logger.h"
+#include "components/cast_channel/proto/cast_channel.pb.h"
#include "net/base/address_list.h"
#include "net/base/host_port_pair.h"
#include "net/base/net_errors.h"
@@ -57,8 +57,6 @@
#define VLOG_WITH_CONNECTION(level) VLOG(level) << CONNECTION_INFO()
#define LOG_WITH_CONNECTION(level) LOG(level) << CONNECTION_INFO()
-namespace extensions {
-namespace api {
namespace cast_channel {
namespace {
@@ -207,8 +205,8 @@ std::unique_ptr<net::SSLClientSocket> CastSocketImpl::CreateSslSocket(
std::unique_ptr<net::ClientSocketHandle> connection(
new net::ClientSocketHandle);
connection->SetSocket(std::move(socket));
- net::HostPortPair host_and_port = net::HostPortPair::FromIPEndPoint(
- ip_endpoint_);
+ net::HostPortPair host_and_port =
+ net::HostPortPair::FromIPEndPoint(ip_endpoint_);
return net::ClientSocketFactory::GetDefaultFactory()->CreateSSLClientSocket(
std::move(connection), host_and_port, ssl_config, context);
@@ -275,8 +273,7 @@ void CastSocketImpl::Connect(std::unique_ptr<CastTransport::Delegate> delegate,
DCHECK(connect_timeout_callback_.IsCancelled());
connect_timeout_callback_.Reset(
base::Bind(&CastSocketImpl::OnConnectTimeout, base::Unretained(this)));
- GetTimer()->Start(FROM_HERE,
- connect_timeout_,
+ GetTimer()->Start(FROM_HERE, connect_timeout_,
connect_timeout_callback_.callback());
}
@@ -508,8 +505,7 @@ void CastSocketImpl::AuthTransportDelegate::OnMessage(
}
}
-void CastSocketImpl::AuthTransportDelegate::Start() {
-}
+void CastSocketImpl::AuthTransportDelegate::Start() {}
int CastSocketImpl::DoAuthChallengeReplyComplete(int result) {
VLOG_WITH_CONNECTION(1) << "DoAuthChallengeReplyComplete: " << result;
@@ -615,6 +611,4 @@ void CastSocketImpl::SetErrorState(ChannelError error_state) {
}
} // namespace cast_channel
-} // namespace api
-} // namespace extensions
#undef VLOG_WITH_CONNECTION

Powered by Google App Engine
This is Rietveld 408576698