Index: extensions/browser/api/cast_channel/cast_socket.cc |
diff --git a/chrome/browser/extensions/api/cast_channel/cast_socket.cc b/extensions/browser/api/cast_channel/cast_socket.cc |
similarity index 97% |
rename from chrome/browser/extensions/api/cast_channel/cast_socket.cc |
rename to extensions/browser/api/cast_channel/cast_socket.cc |
index 6130d92e18755dc825880177b785f7536baf5afc..8d7f0779da94d5c14612d5001cafba93e0ebd0af 100644 |
--- a/chrome/browser/extensions/api/cast_channel/cast_socket.cc |
+++ b/extensions/browser/api/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 "chrome/browser/extensions/api/cast_channel/cast_socket.h" |
+#include "extensions/browser/api/cast_channel/cast_socket.h" |
#include <stdlib.h> |
#include <string.h> |
@@ -13,9 +13,9 @@ |
#include "base/numerics/safe_conversions.h" |
#include "base/strings/string_number_conversions.h" |
#include "base/sys_byteorder.h" |
-#include "chrome/browser/extensions/api/cast_channel/cast_auth_util.h" |
-#include "chrome/browser/extensions/api/cast_channel/cast_channel.pb.h" |
-#include "chrome/browser/extensions/api/cast_channel/cast_message_util.h" |
+#include "extensions/browser/api/cast_channel/cast_auth_util.h" |
+#include "extensions/browser/api/cast_channel/cast_channel.pb.h" |
+#include "extensions/browser/api/cast_channel/cast_message_util.h" |
#include "net/base/address_list.h" |
#include "net/base/host_port_pair.h" |
#include "net/base/net_errors.h" |
@@ -49,18 +49,18 @@ const int kTcpKeepAliveDelaySecs = 10; |
namespace extensions { |
static base::LazyInstance<BrowserContextKeyedAPIFactory< |
- ApiResourceManager<api::cast_channel::CastSocket> > > g_factory = |
+ ApiResourceManager<core_api::cast_channel::CastSocket> > > g_factory = |
LAZY_INSTANCE_INITIALIZER; |
// static |
template <> |
BrowserContextKeyedAPIFactory< |
- ApiResourceManager<api::cast_channel::CastSocket> >* |
-ApiResourceManager<api::cast_channel::CastSocket>::GetFactoryInstance() { |
+ ApiResourceManager<core_api::cast_channel::CastSocket> >* |
+ApiResourceManager<core_api::cast_channel::CastSocket>::GetFactoryInstance() { |
return g_factory.Pointer(); |
} |
-namespace api { |
+namespace core_api { |
namespace cast_channel { |
CastSocket::CastSocket(const std::string& owner_extension_id, |
@@ -682,7 +682,7 @@ bool CastSocket::Serialize(const CastMessage& message_proto, |
header.SetMessageSize(message_size); |
header.PrependToString(message_data); |
return true; |
-}; |
+} |
void CastSocket::CloseWithError(ChannelError error) { |
DCHECK(CalledOnValidThread()); |
@@ -705,8 +705,8 @@ bool CastSocket::CalledOnValidThread() const { |
CastSocket::MessageHeader::MessageHeader() : message_size(0) { } |
void CastSocket::MessageHeader::SetMessageSize(size_t size) { |
- DCHECK(size < static_cast<size_t>(kuint32max)); |
- DCHECK(size > 0); |
+ DCHECK_LT(size, static_cast<size_t>(kuint32max)); |
+ DCHECK_GT(size, 0U); |
message_size = static_cast<size_t>(size); |
} |
@@ -754,7 +754,7 @@ bool CastSocket::WriteRequest::SetContent(const CastMessage& message_proto) { |
CastSocket::WriteRequest::~WriteRequest() { } |
} // namespace cast_channel |
-} // namespace api |
+} // namespace core_api |
} // namespace extensions |
#undef VLOG_WITH_CONNECTION |