remoting/protocol/pepper_session.cc - Issue 8604001: Move SSL layer initialization into ChannelAuthenticator implementations.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: remoting/protocol/pepper_session.cc

Issue 8604001: Move SSL layer initialization into ChannelAuthenticator implementations. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: - Created 9 years, 1 month 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

« remoting/protocol/pepper_channel.h ('K') | « remoting/protocol/pepper_channel.h ('k') | remoting/protocol/pepper_stream_channel.h » ('j') | remoting/protocol/simple_client_channel_authenticator.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: remoting/protocol/pepper_session.cc

diff --git a/remoting/protocol/pepper_session.cc b/remoting/protocol/pepper_session.cc

index ce56fd51432557c6e1cc472cffbb93f8477bee96..a75835b08a9526b29812e97ae0746bc88e4894eb 100644

--- a/remoting/protocol/pepper_session.cc

+++ b/remoting/protocol/pepper_session.cc

@@ -14,6 +14,7 @@

#include "remoting/protocol/jingle_messages.h"

#include "remoting/protocol/pepper_session_manager.h"

#include "remoting/protocol/pepper_stream_channel.h"

+#include "remoting/protocol/simple_client_channel_authenticator.h"

#include "third_party/libjingle/source/talk/p2p/base/candidate.h"

#include "third_party/libjingle/source/talk/xmllite/xmlelement.h"

@@ -116,7 +117,9 @@ void PepperSession::CreateStreamChannel(

PepperStreamChannel* channel = new PepperStreamChannel(this, name, callback);

channels_[name] = channel;

channel->Connect(session_manager_->pp_instance_,

- session_manager_->transport_config_, remote_cert_);

+ session_manager_->transport_config_,

+ new SimpleClientChannelAuthenticator(

+ remote_cert_, shared_secret_));

}

void PepperSession::CreateDatagramChannel(