Update To 11.40.268.0

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

diff --git a/src/remoting/protocol/ssl_hmac_channel_authenticator_unittest.cc b/src/remoting/protocol/ssl_hmac_channel_authenticator_unittest.cc
index 37fee45..e57ae00 100644 (file)
--- a/src/remoting/protocol/ssl_hmac_channel_authenticator_unittest.cc
+++ b/src/remoting/protocol/ssl_hmac_channel_authenticator_unittest.cc
@@ -9,7 +9,6 @@
 #include "base/files/file_path.h"
 #include "base/files/file_util.h"
 #include "base/message_loop/message_loop.h"
-#include "base/path_service.h"
 #include "base/test/test_timeouts.h"
 #include "base/timer/timer.h"
 #include "crypto/rsa_private_key.h"
@@ -51,10 +50,10 @@ ACTION_P(QuitThreadOnCounter, counter) {
 class SslHmacChannelAuthenticatorTest : public testing::Test {
  public:
   SslHmacChannelAuthenticatorTest() {}
-  virtual ~SslHmacChannelAuthenticatorTest() {}
+  ~SslHmacChannelAuthenticatorTest() override {}
 
  protected:
-  virtual void SetUp() OVERRIDE {
+  void SetUp() override {
     base::FilePath certs_dir(net::GetTestCertsDirectory());
 
     base::FilePath cert_path = certs_dir.AppendASCII("unittest.selfsigned.der");
@@ -75,12 +74,12 @@ class SslHmacChannelAuthenticatorTest : public testing::Test {
     client_fake_socket_->PairWith(host_fake_socket_.get());
 
     client_auth_->SecureAndAuthenticate(
-        client_fake_socket_.PassAs<net::StreamSocket>(),
+        client_fake_socket_.Pass(),
         base::Bind(&SslHmacChannelAuthenticatorTest::OnClientConnected,
                    base::Unretained(this)));
 
     host_auth_->SecureAndAuthenticate(
-        host_fake_socket_.PassAs<net::StreamSocket>(),
+        host_fake_socket_.Pass(),
         base::Bind(&SslHmacChannelAuthenticatorTest::OnHostConnected,
                    base::Unretained(this), std::string("ref argument value")));