[cast_channel] Clean up CastSocketImpl ctor parameters

components/cast_channel/cast_socket.h

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef COMPONENTS_CAST_CHANNEL_CAST_SOCKET_H_
 #define COMPONENTS_CAST_CHANNEL_CAST_SOCKET_H_
 
 #include <stdint.h>
 
 #include <queue>
@@ skipping 37 matching lines @@
   VIDEO_OUT = 1 << 0,
   VIDEO_IN = 1 << 1,
   AUDIO_OUT = 1 << 2,
   AUDIO_IN = 1 << 3,
   DEV_MODE = 1 << 4
 };
 
 // Public interface of the CastSocket class.
 class CastSocket {
  public:
-  using ChannelError = ::cast_channel::ChannelError;
-  using ChannelAuthType = ::cast_channel::ChannelAuthType;
-  using ReadyState = ::cast_channel::ReadyState;
-
   virtual ~CastSocket() {}
 
   // Used by BrowserContextKeyedAPIFactory.
   static const char* service_name() { return "CastSocketImplManager"; }
 
   // Connects the channel to the peer. If successful, the channel will be in
   // READY_STATE_OPEN.  DO NOT delete the CastSocket object in |callback|.
   // Instead use Close().
   // |callback| will be invoked with any ChannelError that occurred, or
   // CHANNEL_ERROR_NONE if successful.
@@ skipping 13 matching lines @@
 
   // The IP endpoint for the destination of the channel.
   virtual const net::IPEndPoint& ip_endpoint() const = 0;
 
   // Channel id generated by the CastChannelService.
   virtual int id() const = 0;
 
   // Sets the channel id generated by CastChannelService.
   virtual void set_id(int id) = 0;
 
-  // The authentication level requested for the channel.
-  virtual ChannelAuthType channel_auth() const = 0;
-
   // The ready state of the channel.
   virtual ReadyState ready_state() const = 0;
 
   // Returns the last error that occurred on this channel, or
   // CHANNEL_ERROR_NONE if no error has occurred.
   virtual ChannelError error_state() const = 0;
 
   // True when keep-alive signaling is handled for this socket.
   virtual bool keep_alive() const = 0;
 
@@ skipping 14 matching lines @@
 };
 
 // This class implements a channel between Chrome and a Cast device using a TCP
 // socket with SSL.  The channel may authenticate that the receiver is a genuine
 // Cast device.  All CastSocketImpl objects must be used only on the IO thread.
 //
 // NOTE: Not called "CastChannel" to reduce confusion with the generated API
 // code.
 class CastSocketImpl : public CastSocket {
  public:
-  // Creates a new CastSocket that connects to |ip_endpoint| with
-  // |channel_auth|. |owner_extension_id| is the id of the extension that opened
-  // the socket.  |channel_auth| must not be CHANNEL_AUTH_NONE.
+  // Creates a new CastSocket that connects to |ip_endpoint|.
   // Parameters:
-  // |owner_extension_id|: ID of the extension calling the API.
   // |ip_endpoint|: IP address of the remote host.
-  // |channel_auth|: Authentication method used for connecting to a Cast
-  //                 receiver.
   // |net_log|: Log of socket events.
   // |connect_timeout|: Connection timeout interval.
   // |logger|: Log of cast channel events.
-  CastSocketImpl(const std::string& owner_extension_id,
-                 const net::IPEndPoint& ip_endpoint,
-                 ChannelAuthType channel_auth,
+  CastSocketImpl(const net::IPEndPoint& ip_endpoint,
                  net::NetLog* net_log,
                  const base::TimeDelta& connect_timeout,
                  bool keep_alive,
                  const scoped_refptr<Logger>& logger,
                  uint64_t device_capabilities);
 
   // For test-only.
   // This constructor allows for setting a custom AuthContext.
-  CastSocketImpl(const std::string& owner_extension_id,
-                 const net::IPEndPoint& ip_endpoint,
-                 ChannelAuthType channel_auth,
+  CastSocketImpl(const net::IPEndPoint& ip_endpoint,
                  net::NetLog* net_log,
                  const base::TimeDelta& connect_timeout,
                  bool keep_alive,
                  const scoped_refptr<Logger>& logger,
                  uint64_t device_capabilities,
                  const AuthContext& auth_context);
 
   // Ensures that the socket is closed.
   ~CastSocketImpl() override;
 
   // CastSocket interface.
   void Connect(std::unique_ptr<CastTransport::Delegate> delegate,
                base::Callback<void(ChannelError)> callback) override;
   CastTransport* transport() const override;
   void Close(const net::CompletionCallback& callback) override;
   const net::IPEndPoint& ip_endpoint() const override;
   int id() const override;
   void set_id(int channel_id) override;
-  ChannelAuthType channel_auth() const override;
   ReadyState ready_state() const override;
   ChannelError error_state() const override;
   bool keep_alive() const override;
   bool audio_only() const override;
 
  protected:
   // CastTransport::Delegate methods for receiving handshake messages.
   class AuthTransportDelegate : public CastTransport::Delegate {
    public:
     explicit AuthTransportDelegate(CastSocketImpl* socket);
@@ skipping 102 matching lines @@
 
   void SetConnectState(ConnectionState connect_state);
   void SetReadyState(ReadyState ready_state);
 
   THREAD_CHECKER(thread_checker_);
 
   // The id of the channel.
   int channel_id_;
   // The IP endpoint that the the channel is connected to.
   net::IPEndPoint ip_endpoint_;
-  // Receiver authentication requested for the channel.
-  ChannelAuthType channel_auth_;
   // The NetLog for this service.
   net::NetLog* net_log_;
   // The NetLog source for this service.
   net::NetLogSource net_log_source_;
   // True when keep-alive signaling should be handled for this socket.
   bool keep_alive_;
 
   // Shared logging object, used to log CastSocket events for diagnostics.
   scoped_refptr<Logger> logger_;
 
@@ skipping 74 matching lines @@
 
   // Raw pointer to the auth handshake delegate. Used to get detailed error
   // information.
   AuthTransportDelegate* auth_delegate_;
 
   DISALLOW_COPY_AND_ASSIGN(CastSocketImpl);
 };
 }  // namespace cast_channel
 
 #endif  // COMPONENTS_CAST_CHANNEL_CAST_SOCKET_H_