| Index: components/cast_channel/cast_transport.h
|
| diff --git a/extensions/browser/api/cast_channel/cast_transport.h b/components/cast_channel/cast_transport.h
|
| similarity index 93%
|
| rename from extensions/browser/api/cast_channel/cast_transport.h
|
| rename to components/cast_channel/cast_transport.h
|
| index fec2434c0e3d76104ecbcc679d8b340eaeec3223..460bd6fa7d493a0810c97a70f7e2ab357b6e0dff 100644
|
| --- a/extensions/browser/api/cast_channel/cast_transport.h
|
| +++ b/components/cast_channel/cast_transport.h
|
| @@ -2,8 +2,8 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#ifndef EXTENSIONS_BROWSER_API_CAST_CHANNEL_CAST_TRANSPORT_H_
|
| -#define EXTENSIONS_BROWSER_API_CAST_CHANNEL_CAST_TRANSPORT_H_
|
| +#ifndef COMPONENTS_CAST_CHANNEL_CAST_TRANSPORT_H_
|
| +#define COMPONENTS_CAST_CHANNEL_CAST_TRANSPORT_H_
|
|
|
| #include <queue>
|
| #include <string>
|
| @@ -13,8 +13,8 @@
|
| #include "base/threading/non_thread_safe.h"
|
| #include "base/threading/thread_checker.h"
|
| #include "components/cast_channel/cast_channel_enum.h"
|
| -#include "extensions/browser/api/cast_channel/logger.h"
|
| -#include "extensions/common/api/cast_channel/logging.pb.h"
|
| +#include "components/cast_channel/logger.h"
|
| +#include "components/cast_channel/proto/logging.pb.h"
|
| #include "net/base/completion_callback.h"
|
| #include "net/base/ip_endpoint.h"
|
|
|
| @@ -25,8 +25,6 @@ class GrowableIOBuffer;
|
| class Socket;
|
| } // namespace net
|
|
|
| -namespace extensions {
|
| -namespace api {
|
| namespace cast_channel {
|
| class CastMessage;
|
| class MessageFramer;
|
| @@ -74,7 +72,7 @@ class CastTransport {
|
| };
|
|
|
| // Manager class for reading and writing messages to/from a socket.
|
| -class CastTransportImpl : public CastTransport, public base::NonThreadSafe {
|
| +class CastTransportImpl : public CastTransport {
|
| public:
|
| using ChannelAuthType = ::cast_channel::ChannelAuthType;
|
| using ChannelError = ::cast_channel::ChannelError;
|
| @@ -220,10 +218,10 @@ class CastTransportImpl : public CastTransport, public base::NonThreadSafe {
|
| // Accumulates details of events and errors, for debugging purposes.
|
| scoped_refptr<Logger> logger_;
|
|
|
| + THREAD_CHECKER(thread_checker_);
|
| +
|
| DISALLOW_COPY_AND_ASSIGN(CastTransportImpl);
|
| };
|
| } // namespace cast_channel
|
| -} // namespace api
|
| -} // namespace extensions
|
|
|
| -#endif // EXTENSIONS_BROWSER_API_CAST_CHANNEL_CAST_TRANSPORT_H_
|
| +#endif // COMPONENTS_CAST_CHANNEL_CAST_TRANSPORT_H_
|
|
|