summaryrefslogtreecommitdiffstats
path: root/remoting/protocol/authenticator_test_base.h
diff options
context:
space:
mode:
authorsergeyu <sergeyu@chromium.org>2014-09-11 14:45:02 -0700
committerCommit bot <commit-bot@chromium.org>2014-09-11 22:01:29 +0000
commit28d886c967e016a5d5812be43cd5916f577c2e10 (patch)
tree4510350de11125ab89cfcf60ae8a624a8659037b /remoting/protocol/authenticator_test_base.h
parent042e7e077ee2cb726804c27313093241b97bf09e (diff)
downloadchromium_src-28d886c967e016a5d5812be43cd5916f577c2e10.zip
chromium_src-28d886c967e016a5d5812be43cd5916f577c2e10.tar.gz
chromium_src-28d886c967e016a5d5812be43cd5916f577c2e10.tar.bz2
Move PseudoTCP and channel auth out of LibjingleTransportFactory.
Previously TransportFactory interface was responsible for creation and initialization of several protocol layers, including PseudoTCP and authentication (TLS). Simplified it so now it only creates raw datagram transport channel. PseudoTcpChannelFactory is now responsible for setting up PseudoTcpAdapter and AuthenticatingChannelFactory takes care of channel authentication. Also added DatagramChannelFactory for Datagram channels. This change will make it possible to replace PseudoTcpChannelFactory with an object that creates SCTP-based channels. Also fixed a bug in SslHmacChannelAuthenticator. It wasn't working properly when deleted from the callback. (base::Callback objects shouldn't be deleted while being called because when deleted they also destroy reference parameters values they are holding). BUG=402993 Review URL: https://codereview.chromium.org/551173004 Cr-Commit-Position: refs/heads/master@{#294474}
Diffstat (limited to 'remoting/protocol/authenticator_test_base.h')
-rw-r--r--remoting/protocol/authenticator_test_base.h7
1 files changed, 3 insertions, 4 deletions
diff --git a/remoting/protocol/authenticator_test_base.h b/remoting/protocol/authenticator_test_base.h
index e20774a..c5c7e6b 100644
--- a/remoting/protocol/authenticator_test_base.h
+++ b/remoting/protocol/authenticator_test_base.h
@@ -9,7 +9,6 @@
#include "base/memory/ref_counted.h"
#include "base/message_loop/message_loop.h"
-#include "net/base/net_errors.h"
#include "testing/gmock/include/gmock/gmock.h"
#include "testing/gtest/include/gtest/gtest.h"
@@ -37,7 +36,7 @@ class AuthenticatorTestBase : public testing::Test {
public:
MockChannelDoneCallback();
~MockChannelDoneCallback();
- MOCK_METHOD1(OnDone, void(net::Error error));
+ MOCK_METHOD1(OnDone, void(int error));
};
static void ContinueAuthExchangeWith(Authenticator* sender,
@@ -49,9 +48,9 @@ class AuthenticatorTestBase : public testing::Test {
void RunHostInitiatedAuthExchange();
void RunChannelAuth(bool expected_fail);
- void OnHostConnected(net::Error error,
+ void OnHostConnected(int error,
scoped_ptr<net::StreamSocket> socket);
- void OnClientConnected(net::Error error,
+ void OnClientConnected(int error,
scoped_ptr<net::StreamSocket> socket);
base::MessageLoop message_loop_;