Remove video_channel() from Session interface

remoting/protocol/fake_session.h

 // Copyright (c) 2011 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 REMOTING_PROTOCOL_FAKE_SESSION_H_
 #define REMOTING_PROTOCOL_FAKE_SESSION_H_
 
+#include <map>
 #include <string>
 #include <vector>
 
 #include "base/memory/scoped_ptr.h"
 #include "net/socket/socket.h"
+#include "net/socket/stream_socket.h"
 #include "remoting/protocol/session.h"
 
 namespace remoting {
 namespace protocol {
 
 extern const char kTestJid[];
 
 // FakeSocket implement net::Socket interface for FakeConnection. All data
 // written to FakeSocket is stored in a buffer returned by written_data().
 // Read() reads data from another buffer that can be set with AppendInputData().
 // Pending reads are supported, so if there is a pending read AppendInputData()
 // calls the read callback.
-class FakeSocket : public net::Socket {
+class FakeSocket : public net::StreamSocket {
  public:
   FakeSocket();
   virtual ~FakeSocket();
 
   const std::string& written_data() const { return written_data_; }
 
   void AppendInputData(const char* data, int data_size);
   int input_pos() const { return input_pos_; }
   bool read_pending() const { return read_pending_; }
 
   // net::Socket interface.
   virtual int Read(net::IOBuffer* buf, int buf_len,
                    net::CompletionCallback* callback);
   virtual int Write(net::IOBuffer* buf, int buf_len,
                     net::CompletionCallback* callback);
 
   virtual bool SetReceiveBufferSize(int32 size);
   virtual bool SetSendBufferSize(int32 size);
 
+  // net::StreamSocket interface.
+  virtual int Connect(net::CompletionCallback* callback) OVERRIDE;
+  virtual void Disconnect() OVERRIDE;
+  virtual bool IsConnected() const OVERRIDE;
+  virtual bool IsConnectedAndIdle() const OVERRIDE;
+  virtual int GetPeerAddress(net::AddressList* address) const OVERRIDE;
+  virtual int GetLocalAddress(net::IPEndPoint* address) const OVERRIDE;
+  virtual const net::BoundNetLog& NetLog() const OVERRIDE;
+  virtual void SetSubresourceSpeculation() OVERRIDE;
+  virtual void SetOmniboxSpeculation() OVERRIDE;
+  virtual bool WasEverUsed() const OVERRIDE;
+  virtual bool UsingTCPFastOpen() const OVERRIDE;
+  virtual int64 NumBytesRead() const OVERRIDE;
+  virtual base::TimeDelta GetConnectTimeMicros() const OVERRIDE;
+
  private:
   bool read_pending_;
   scoped_refptr<net::IOBuffer> read_buffer_;
   int read_buffer_size_;
   net::CompletionCallback* read_callback_;
 
   std::string written_data_;
   std::string input_data_;
   int input_pos_;
+
+  net::BoundNetLog net_log_;
+
+  DISALLOW_COPY_AND_ASSIGN(FakeSocket);
 };
 
 // FakeUdpSocket is similar to FakeSocket but behaves as UDP socket. All written
 // packets are stored separetely in written_packets(). AppendInputPacket() adds
 // one packet that will be returned by Read().
 class FakeUdpSocket : public net::Socket {
  public:
   FakeUdpSocket();
   virtual ~FakeUdpSocket();
 
@@ skipping 15 matching lines @@
 
  private:
   bool read_pending_;
   scoped_refptr<net::IOBuffer> read_buffer_;
   int read_buffer_size_;
   net::CompletionCallback* read_callback_;
 
   std::vector<std::string> written_packets_;
   std::vector<std::string> input_packets_;
   int input_pos_;
+
+  DISALLOW_COPY_AND_ASSIGN(FakeUdpSocket);
 };
 
 // FakeSession is a dummy protocol::Session that uses FakeSocket for all
 // channels.
 class FakeSession : public Session {
  public:
   FakeSession();
   virtual ~FakeSession();
 
   StateChangeCallback* state_change_callback() { return callback_.get(); }
 
   void set_message_loop(MessageLoop* message_loop) {
     message_loop_ = message_loop;
   }
 
   bool is_closed() const { return closed_; }
 
+  FakeSocket* GetStreamChannel(const std::string& name);
+  FakeUdpSocket* GetDatagramChannel(const std::string& name);
+
+  // Session interface.
   virtual void SetStateChangeCallback(StateChangeCallback* callback);
 
   virtual void CreateStreamChannel(
       const std::string& name, const StreamChannelCallback& callback);
   virtual void CreateDatagramChannel(
       const std::string& name, const DatagramChannelCallback& callback);
 
   virtual FakeSocket* control_channel();
   virtual FakeSocket* event_channel();
-  virtual FakeSocket* video_channel();
-
-  virtual FakeUdpSocket* video_rtp_channel();
-  virtual FakeUdpSocket* video_rtcp_channel();
 
   virtual const std::string& jid();
 
   virtual const CandidateSessionConfig* candidate_config();
   virtual const SessionConfig* config();
   virtual void set_config(const SessionConfig* config);
 
   virtual const std::string& initiator_token();
   virtual void set_initiator_token(const std::string& initiator_token);
   virtual const std::string& receiver_token();
   virtual void set_receiver_token(const std::string& receiver_token);
 
   virtual void set_shared_secret(const std::string& secret);
   virtual const std::string& shared_secret();
 
   virtual void Close();
 
  public:
   scoped_ptr<StateChangeCallback> callback_;
   scoped_ptr<const CandidateSessionConfig> candidate_config_;
   scoped_ptr<const SessionConfig> config_;
   MessageLoop* message_loop_;
   FakeSocket control_channel_;
   FakeSocket event_channel_;
-  FakeSocket video_channel_;
-  FakeUdpSocket video_rtp_channel_;
-  FakeUdpSocket video_rtcp_channel_;
+
+  std::map<std::string, FakeSocket*> stream_channels_;
+  std::map<std::string, FakeUdpSocket*> datagram_channels_;
 
   std::string initiator_token_;
   std::string receiver_token_;
 
   std::string shared_secret_;
 
   std::string jid_;
   bool closed_;
+
+  DISALLOW_COPY_AND_ASSIGN(FakeSession);
 };
 
 }  // namespace protocol
 }  // namespace remoting
 
 #endif  // REMOTING_PROTOCOL_FAKE_SESSION_H_