Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(617)

Unified Diff: remoting/protocol/secure_channel_factory.cc

Issue 1197853003: Add P2PDatagramSocket and P2PStreamSocket interfaces. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « remoting/protocol/secure_channel_factory.h ('k') | remoting/protocol/ssl_hmac_channel_authenticator.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/protocol/secure_channel_factory.cc
diff --git a/remoting/protocol/secure_channel_factory.cc b/remoting/protocol/secure_channel_factory.cc
index 0ed2a655b18d2508e75509d385650de8d80ea8d6..abfd178343034b617b5112ab66543fbe7ffdb235 100644
--- a/remoting/protocol/secure_channel_factory.cc
+++ b/remoting/protocol/secure_channel_factory.cc
@@ -5,9 +5,9 @@
#include "remoting/protocol/secure_channel_factory.h"
#include "base/bind.h"
-#include "net/socket/stream_socket.h"
#include "remoting/protocol/authenticator.h"
#include "remoting/protocol/channel_authenticator.h"
+#include "remoting/protocol/p2p_stream_socket.h"
namespace remoting {
namespace protocol {
@@ -49,7 +49,7 @@ void SecureChannelFactory::CancelChannelCreation(
void SecureChannelFactory::OnBaseChannelCreated(
const std::string& name,
const ChannelCreatedCallback& callback,
- scoped_ptr<net::StreamSocket> socket) {
+ scoped_ptr<P2PStreamSocket> socket) {
if (!socket) {
callback.Run(nullptr);
return;
@@ -68,7 +68,7 @@ void SecureChannelFactory::OnSecureChannelCreated(
const std::string& name,
const ChannelCreatedCallback& callback,
int error,
- scoped_ptr<net::StreamSocket> socket) {
+ scoped_ptr<P2PStreamSocket> socket) {
DCHECK((socket && error == net::OK) || (!socket && error != net::OK));
AuthenticatorMap::iterator it = channel_authenticators_.find(name);
« no previous file with comments | « remoting/protocol/secure_channel_factory.h ('k') | remoting/protocol/ssl_hmac_channel_authenticator.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698