Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(18)

Unified Diff: remoting/protocol/fake_session.h

Issue 580243003: Cleanup Fake* classes in remoting/protocol (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@sctp
Patch Set: Created 6 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: remoting/protocol/fake_session.h
diff --git a/remoting/protocol/fake_session.h b/remoting/protocol/fake_session.h
index 524068168a028aca41fdf6997e412cd5f73404de..b04cdd8359acc1c0df84577ff4ce09b3205e6ab7 100644
--- a/remoting/protocol/fake_session.h
+++ b/remoting/protocol/fake_session.h
@@ -10,161 +10,28 @@
#include <vector>
#include "base/memory/scoped_ptr.h"
-#include "base/memory/weak_ptr.h"
-#include "net/base/completion_callback.h"
-#include "net/socket/socket.h"
-#include "net/socket/stream_socket.h"
+#include "remoting/protocol/fake_stream_socket.h"
#include "remoting/protocol/session.h"
-#include "remoting/protocol/stream_channel_factory.h"
-
-namespace base {
-class MessageLoop;
-}
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.
-//
-// Two fake sockets can be connected to each other using the
-// PairWith() method, e.g.: a->PairWith(b). After this all data
-// written to |a| can be read from |b| and vica versa. Two connected
-// sockets |a| and |b| must be created and used on the same thread.
-class FakeSocket : public net::StreamSocket {
- public:
- FakeSocket();
- virtual ~FakeSocket();
-
- const std::string& written_data() const { return written_data_; }
-
- void set_write_limit(int write_limit) { write_limit_ = write_limit; }
- void set_async_write(bool async_write) { async_write_ = async_write; }
- void set_next_write_error(int error) { next_write_error_ = error; }
- void set_next_read_error(int error) { next_read_error_ = error; }
- void AppendInputData(const std::vector<char>& data);
- void PairWith(FakeSocket* peer_socket);
- int input_pos() const { return input_pos_; }
- bool read_pending() const { return read_pending_; }
-
- // net::Socket implementation.
- virtual int Read(net::IOBuffer* buf, int buf_len,
- const net::CompletionCallback& callback) OVERRIDE;
- virtual int Write(net::IOBuffer* buf, int buf_len,
- const net::CompletionCallback& callback) OVERRIDE;
-
- virtual int SetReceiveBufferSize(int32 size) OVERRIDE;
- virtual int SetSendBufferSize(int32 size) OVERRIDE;
-
- // net::StreamSocket interface.
- virtual int Connect(const net::CompletionCallback& callback) OVERRIDE;
- virtual void Disconnect() OVERRIDE;
- virtual bool IsConnected() const OVERRIDE;
- virtual bool IsConnectedAndIdle() const OVERRIDE;
- virtual int GetPeerAddress(net::IPEndPoint* 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 bool WasNpnNegotiated() const OVERRIDE;
- virtual net::NextProto GetNegotiatedProtocol() const OVERRIDE;
- virtual bool GetSSLInfo(net::SSLInfo* ssl_info) OVERRIDE;
-
- private:
- void DoAsyncWrite(scoped_refptr<net::IOBuffer> buf, int buf_len,
- const net::CompletionCallback& callback);
- void DoWrite(net::IOBuffer* buf, int buf_len);
-
- bool async_write_;
- bool write_pending_;
- int write_limit_;
- int next_write_error_;
-
- int next_read_error_;
- bool read_pending_;
- scoped_refptr<net::IOBuffer> read_buffer_;
- int read_buffer_size_;
- net::CompletionCallback read_callback_;
- base::WeakPtr<FakeSocket> peer_socket_;
-
- std::string written_data_;
- std::string input_data_;
- int input_pos_;
-
- net::BoundNetLog net_log_;
-
- base::MessageLoop* message_loop_;
- base::WeakPtrFactory<FakeSocket> weak_factory_;
-
- 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();
-
- const std::vector<std::string>& written_packets() const {
- return written_packets_;
- }
-
- void AppendInputPacket(const char* data, int data_size);
- int input_pos() const { return input_pos_; }
-
- // net::Socket implementation.
- virtual int Read(net::IOBuffer* buf, int buf_len,
- const net::CompletionCallback& callback) OVERRIDE;
- virtual int Write(net::IOBuffer* buf, int buf_len,
- const net::CompletionCallback& callback) OVERRIDE;
-
- virtual int SetReceiveBufferSize(int32 size) OVERRIDE;
- virtual int SetSendBufferSize(int32 size) OVERRIDE;
-
- 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_;
-
- base::MessageLoop* message_loop_;
-
- DISALLOW_COPY_AND_ASSIGN(FakeUdpSocket);
-};
-
-// FakeSession is a dummy protocol::Session that uses FakeSocket for all
+// FakeSession is a dummy protocol::Session that uses FakeStreamSocket for all
// channels.
-class FakeSession : public Session,
- public StreamChannelFactory {
+class FakeSession : public Session {
public:
FakeSession();
virtual ~FakeSession();
EventHandler* event_handler() { return event_handler_; }
- void set_async_creation(bool async_creation) {
- async_creation_ = async_creation;
- }
-
void set_error(ErrorCode error) { error_ = error; }
bool is_closed() const { return closed_; }
- FakeSocket* GetStreamChannel(const std::string& name);
- FakeUdpSocket* GetDatagramChannel(const std::string& name);
+ FakeStreamChannelFactory& fake_channel_factory() { return channel_factory_; }
Wez 2014/09/20 00:25:10 Consider leaving GetFake[Stream]Channel() on this
Sergey Ulanov 2014/09/22 19:22:11 Only ChannelMultiplexer tests are using this funct
// Session interface.
virtual void SetEventHandler(EventHandler* event_handler) OVERRIDE;
@@ -177,32 +44,18 @@ class FakeSession : public Session,
virtual StreamChannelFactory* GetMultiplexedChannelFactory() OVERRIDE;
virtual void Close() OVERRIDE;
- // StreamChannelFactory interface.
- virtual void CreateChannel(const std::string& name,
- const ChannelCreatedCallback& callback) OVERRIDE;
- virtual void CancelChannelCreation(const std::string& name) OVERRIDE;
-
public:
- void NotifyChannelCreated(const std::string& name,
- const ChannelCreatedCallback& callback);
-
EventHandler* event_handler_;
scoped_ptr<const CandidateSessionConfig> candidate_config_;
SessionConfig config_;
- base::MessageLoop* message_loop_;
- bool async_creation_;
-
- std::map<std::string, FakeSocket*> stream_channels_;
- std::map<std::string, FakeUdpSocket*> datagram_channels_;
+ FakeStreamChannelFactory channel_factory_;
std::string jid_;
ErrorCode error_;
bool closed_;
- base::WeakPtrFactory<FakeSession> weak_factory_;
-
DISALLOW_COPY_AND_ASSIGN(FakeSession);
};

Powered by Google App Engine
This is Rietveld 408576698