| Index: remoting/test/protocol_perftest.cc
|
| diff --git a/remoting/test/protocol_perftest.cc b/remoting/test/protocol_perftest.cc
|
| index 25c36c6d12c75078f3ab0dcdfb61759a782f86ea..a9cd445828aea0584f3bec1805da501f96e9f96d 100644
|
| --- a/remoting/test/protocol_perftest.cc
|
| +++ b/remoting/test/protocol_perftest.cc
|
| @@ -237,7 +237,7 @@ class ProtocolPerfTest
|
| scoped_ptr<protocol::TransportFactory> host_transport_factory(
|
| new protocol::LibjingleTransportFactory(
|
| host_signaling_.get(),
|
| - port_allocator.PassAs<cricket::HttpPortAllocatorBase>(),
|
| + port_allocator.Pass(),
|
| network_settings));
|
|
|
| scoped_ptr<protocol::SessionManager> session_manager(
|
| @@ -308,7 +308,7 @@ class ProtocolPerfTest
|
| scoped_ptr<protocol::TransportFactory> client_transport_factory(
|
| new protocol::LibjingleTransportFactory(
|
| client_signaling_.get(),
|
| - port_allocator.PassAs<cricket::HttpPortAllocatorBase>(),
|
| + port_allocator.Pass(),
|
| network_settings));
|
|
|
| std::vector<protocol::AuthenticationMethod> auth_methods;
|
| @@ -320,10 +320,10 @@ class ProtocolPerfTest
|
| std::string(), // client_pairing_secret
|
| std::string(), // authentication_tag
|
| base::Bind(&ProtocolPerfTest::FetchPin, base::Unretained(this)),
|
| - scoped_ptr<protocol::ThirdPartyClientAuthenticator::TokenFetcher>(),
|
| + nullptr,
|
| auth_methods));
|
| - client_.reset(new ChromotingClient(
|
| - client_context_.get(), this, this, scoped_ptr<AudioPlayer>()));
|
| + client_.reset(
|
| + new ChromotingClient(client_context_.get(), this, this, nullptr));
|
| client_->SetProtocolConfigForTests(protocol_config_->Clone());
|
| client_->Start(
|
| client_signaling_.get(), client_authenticator.Pass(),
|
|
|