1 files changed, 27 insertions, 30 deletions

diff --git a/cast/sender/channel/sender_socket_factory.h b/cast/sender/channel/sender_socket_factory.h
index c58b369a..9cb31066 100644
--- a/cast/sender/channel/sender_socket_factory.h
+++ b/cast/sender/channel/sender_socket_factory.h
@@ -12,26 +12,26 @@
 #include <vector>
 
 #include "cast/common/channel/cast_socket.h"
+#include "cast/common/channel/proto/cast_channel.pb.h"
 #include "cast/sender/channel/cast_auth_util.h"
 #include "platform/api/tls_connection_factory.h"
 #include "platform/base/ip_address.h"
 #include "util/logging.h"
 
+namespace openscreen {
 namespace cast {
-namespace channel {
 
-class SenderSocketFactory final
-    : public openscreen::TlsConnectionFactory::Client,
-      public CastSocket::Client {
+class SenderSocketFactory final : public TlsConnectionFactory::Client,
+                                  public CastSocket::Client {
  public:
   class Client {
    public:
     virtual void OnConnected(SenderSocketFactory* factory,
-                             const openscreen::IPEndpoint& endpoint,
+                             const IPEndpoint& endpoint,
                              std::unique_ptr<CastSocket> socket) = 0;
     virtual void OnError(SenderSocketFactory* factory,
-                         const openscreen::IPEndpoint& endpoint,
-                         openscreen::Error error) = 0;
+                         const IPEndpoint& endpoint,
+                         Error error) = 0;
   };
 
   enum class DeviceMediaPolicy {
@@ -43,39 +43,35 @@ class SenderSocketFactory final
   explicit SenderSocketFactory(Client* client);
   ~SenderSocketFactory();
 
-  void set_factory(openscreen::TlsConnectionFactory* factory) {
+  void set_factory(TlsConnectionFactory* factory) {
     OSP_DCHECK(factory);
     factory_ = factory;
   }
 
-  void Connect(const openscreen::IPEndpoint& endpoint,
+  void Connect(const IPEndpoint& endpoint,
                DeviceMediaPolicy media_policy,
                CastSocket::Client* client);
 
-  // openscreen::TlsConnectionFactory::Client overrides.
-  void OnAccepted(
-      openscreen::TlsConnectionFactory* factory,
-      std::vector<uint8_t> der_x509_peer_cert,
-      std::unique_ptr<openscreen::TlsConnection> connection) override;
-  void OnConnected(
-      openscreen::TlsConnectionFactory* factory,
-      std::vector<uint8_t> der_x509_peer_cert,
-      std::unique_ptr<openscreen::TlsConnection> connection) override;
-  void OnConnectionFailed(
-      openscreen::TlsConnectionFactory* factory,
-      const openscreen::IPEndpoint& remote_address) override;
-  void OnError(openscreen::TlsConnectionFactory* factory,
-               openscreen::Error error) override;
+  // TlsConnectionFactory::Client overrides.
+  void OnAccepted(TlsConnectionFactory* factory,
+                  std::vector<uint8_t> der_x509_peer_cert,
+                  std::unique_ptr<TlsConnection> connection) override;
+  void OnConnected(TlsConnectionFactory* factory,
+                   std::vector<uint8_t> der_x509_peer_cert,
+                   std::unique_ptr<TlsConnection> connection) override;
+  void OnConnectionFailed(TlsConnectionFactory* factory,
+                          const IPEndpoint& remote_address) override;
+  void OnError(TlsConnectionFactory* factory, Error error) override;
 
  private:
   struct PendingConnection {
-    openscreen::IPEndpoint endpoint;
+    IPEndpoint endpoint;
     DeviceMediaPolicy media_policy;
     CastSocket::Client* client;
   };
 
   struct PendingAuth {
-    openscreen::IPEndpoint endpoint;
+    IPEndpoint endpoint;
     DeviceMediaPolicy media_policy;
     std::unique_ptr<CastSocket> socket;
     CastSocket::Client* client;
@@ -87,19 +83,20 @@ class SenderSocketFactory final
   friend bool operator<(uint32_t a, const std::unique_ptr<PendingAuth>& b);
 
   std::vector<PendingConnection>::iterator FindPendingConnection(
-      const openscreen::IPEndpoint& endpoint);
+      const IPEndpoint& endpoint);
 
   // CastSocket::Client overrides.
-  void OnError(CastSocket* socket, openscreen::Error error) override;
-  void OnMessage(CastSocket* socket, CastMessage message) override;
+  void OnError(CastSocket* socket, Error error) override;
+  void OnMessage(CastSocket* socket,
+                 ::cast::channel::CastMessage message) override;
 
   Client* const client_;
-  openscreen::TlsConnectionFactory* factory_ = nullptr;
+  TlsConnectionFactory* factory_ = nullptr;
   std::vector<PendingConnection> pending_connections_;
   std::vector<std::unique_ptr<PendingAuth>> pending_auth_;
 };
 
-}  // namespace channel
 }  // namespace cast
+}  // namespace openscreen
 
 #endif  // CAST_SENDER_CHANNEL_SENDER_SOCKET_FACTORY_H_