Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / remoting / protocol / jingle_session_unittest.cc

diff --git a/src/remoting/protocol/jingle_session_unittest.cc b/src/remoting/protocol/jingle_session_unittest.cc
index 2788137..c92448a 100644 (file)
--- a/src/remoting/protocol/jingle_session_unittest.cc
+++ b/src/remoting/protocol/jingle_session_unittest.cc
@@ -123,10 +123,9 @@ class JingleSessionTest : public testing::Test {
   }
 
  protected:
-  virtual void SetUp() {
-  }
+  void SetUp() override {}
 
-  virtual void TearDown() {
+  void TearDown() override {
     CloseSessions();
     CloseSessionManager();
     base::RunLoop().RunUntilIdle();
@@ -153,8 +152,7 @@ class JingleSessionTest : public testing::Test {
 
     scoped_ptr<TransportFactory> host_transport(new LibjingleTransportFactory(
         NULL,
-        ChromiumPortAllocator::Create(NULL, network_settings)
-            .PassAs<cricket::HttpPortAllocatorBase>(),
+        ChromiumPortAllocator::Create(NULL, network_settings).Pass(),
         network_settings));
     host_server_.reset(new JingleSessionManager(host_transport.Pass()));
     host_server_->Init(host_signal_strategy_.get(), &host_server_listener_);
@@ -168,8 +166,7 @@ class JingleSessionTest : public testing::Test {
         .Times(1);
     scoped_ptr<TransportFactory> client_transport(new LibjingleTransportFactory(
         NULL,
-        ChromiumPortAllocator::Create(NULL, network_settings)
-            .PassAs<cricket::HttpPortAllocatorBase>(),
+        ChromiumPortAllocator::Create(NULL, network_settings).Pass(),
         network_settings));
     client_server_.reset(
         new JingleSessionManager(client_transport.Pass()));