| Index: remoting/protocol/fake_session.h
|
| diff --git a/remoting/protocol/fake_session.h b/remoting/protocol/fake_session.h
|
| index c7793f26f1e941578db39bf29b34c768be7e08f3..524068168a028aca41fdf6997e412cd5f73404de 100644
|
| --- a/remoting/protocol/fake_session.h
|
| +++ b/remoting/protocol/fake_session.h
|
| @@ -14,8 +14,8 @@
|
| #include "net/base/completion_callback.h"
|
| #include "net/socket/socket.h"
|
| #include "net/socket/stream_socket.h"
|
| -#include "remoting/protocol/channel_factory.h"
|
| #include "remoting/protocol/session.h"
|
| +#include "remoting/protocol/stream_channel_factory.h"
|
|
|
| namespace base {
|
| class MessageLoop;
|
| @@ -148,7 +148,7 @@ class FakeUdpSocket : public net::Socket {
|
| // FakeSession is a dummy protocol::Session that uses FakeSocket for all
|
| // channels.
|
| class FakeSession : public Session,
|
| - public ChannelFactory {
|
| + public StreamChannelFactory {
|
| public:
|
| FakeSession();
|
| virtual ~FakeSession();
|
| @@ -173,11 +173,11 @@ class FakeSession : public Session,
|
| virtual const CandidateSessionConfig* candidate_config() OVERRIDE;
|
| virtual const SessionConfig& config() OVERRIDE;
|
| virtual void set_config(const SessionConfig& config) OVERRIDE;
|
| - virtual ChannelFactory* GetTransportChannelFactory() OVERRIDE;
|
| - virtual ChannelFactory* GetMultiplexedChannelFactory() OVERRIDE;
|
| + virtual StreamChannelFactory* GetTransportChannelFactory() OVERRIDE;
|
| + virtual StreamChannelFactory* GetMultiplexedChannelFactory() OVERRIDE;
|
| virtual void Close() OVERRIDE;
|
|
|
| - // ChannelFactory interface.
|
| + // StreamChannelFactory interface.
|
| virtual void CreateChannel(const std::string& name,
|
| const ChannelCreatedCallback& callback) OVERRIDE;
|
| virtual void CancelChannelCreation(const std::string& name) OVERRIDE;
|
|
|