Index: remoting/protocol/pepper_transport_factory.cc |
diff --git a/remoting/protocol/pepper_transport_factory.cc b/remoting/protocol/pepper_transport_factory.cc |
index f593dfc3acac49134e4460fdbbe5b3439e9815e5..315981adfbc98f8f12833f7c17ba00fe627818c3 100644 |
--- a/remoting/protocol/pepper_transport_factory.cc |
+++ b/remoting/protocol/pepper_transport_factory.cc |
@@ -38,13 +38,13 @@ const int kTcpSendBufferSize = kTcpReceiveBufferSize + 30 * 1024; |
class PepperStreamTransport : public StreamTransport, |
public PepperTransportSocketAdapter::Observer { |
public: |
- PepperStreamTransport(pp::Instance* pp_instance); |
+ PepperStreamTransport(pp::Instance* pp_instance, |
+ const TransportConfig& config); |
virtual ~PepperStreamTransport(); |
// StreamTransport interface. |
virtual void Initialize( |
const std::string& name, |
- const TransportConfig& config, |
Transport::EventHandler* event_handler, |
scoped_ptr<ChannelAuthenticator> authenticator) OVERRIDE; |
virtual void Connect( |
@@ -67,8 +67,8 @@ class PepperStreamTransport : public StreamTransport, |
void NotifyConnectFailed(); |
pp::Instance* pp_instance_; |
- std::string name_; |
TransportConfig config_; |
+ std::string name_; |
EventHandler* event_handler_; |
StreamTransport::ConnectedCallback callback_; |
scoped_ptr<ChannelAuthenticator> authenticator_; |
@@ -84,8 +84,10 @@ class PepperStreamTransport : public StreamTransport, |
DISALLOW_COPY_AND_ASSIGN(PepperStreamTransport); |
}; |
-PepperStreamTransport::PepperStreamTransport(pp::Instance* pp_instance) |
+PepperStreamTransport::PepperStreamTransport(pp::Instance* pp_instance, |
+ const TransportConfig& config) |
: pp_instance_(pp_instance), |
+ config_(config), |
event_handler_(NULL), |
channel_(NULL), |
connected_(false) { |
@@ -100,7 +102,6 @@ PepperStreamTransport::~PepperStreamTransport() { |
void PepperStreamTransport::Initialize( |
const std::string& name, |
- const TransportConfig& config, |
Transport::EventHandler* event_handler, |
scoped_ptr<ChannelAuthenticator> authenticator) { |
DCHECK(CalledOnValidThread()); |
@@ -112,7 +113,6 @@ void PepperStreamTransport::Initialize( |
DCHECK(name_.empty()); |
name_ = name; |
- config_ = config; |
event_handler_ = event_handler; |
authenticator_ = authenticator.Pass(); |
} |
@@ -280,8 +280,13 @@ PepperTransportFactory::PepperTransportFactory( |
PepperTransportFactory::~PepperTransportFactory() { |
} |
+void PepperTransportFactory::SetTransportConfig(const TransportConfig& config) { |
+ config_ = config; |
+} |
+ |
scoped_ptr<StreamTransport> PepperTransportFactory::CreateStreamTransport() { |
- return scoped_ptr<StreamTransport>(new PepperStreamTransport(pp_instance_)); |
+ return scoped_ptr<StreamTransport>( |
+ new PepperStreamTransport(pp_instance_, config_)); |
} |
scoped_ptr<DatagramTransport> |