diff options
| author | wez@chromium.org <wez@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-27 05:36:36 +0000 |
|---|---|---|
| committer | wez@chromium.org <wez@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-27 05:36:36 +0000 |
| commit | 7e494c6d13267fe91a649c81ca858a58c449d6c4 (patch) | |
| tree | 25f545d92c1638b7c6a29bb7a38a706a90fae3e9 /remoting/protocol/jingle_session.cc | |
| parent | 278a4e8244ff8105dd2fdd4f8c593b4bd6a34cee (diff) | |
| download | chromium_src-7e494c6d13267fe91a649c81ca858a58c449d6c4.zip chromium_src-7e494c6d13267fe91a649c81ca858a58c449d6c4.tar.gz chromium_src-7e494c6d13267fe91a649c81ca858a58c449d6c4.tar.bz2 | |
Revert 94247 - Add an authentication step to stream channel setup in JingleStreamConnector.
Fix JingleStreamConnector and JingleDatagramConnector tear-down semantics in case of failure.
BUG=88130,90624
TEST=
Review URL: http://codereview.chromium.org/7501007
TBR=wez@chromium.org
Review URL: http://codereview.chromium.org/7497026
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@94249 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting/protocol/jingle_session.cc')
| -rw-r--r-- | remoting/protocol/jingle_session.cc | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/remoting/protocol/jingle_session.cc b/remoting/protocol/jingle_session.cc index 8485336..3e08dca 100644 --- a/remoting/protocol/jingle_session.cc +++ b/remoting/protocol/jingle_session.cc @@ -303,17 +303,6 @@ void JingleSession::set_receiver_token(const std::string& receiver_token) { receiver_token_ = receiver_token; } -void JingleSession::set_shared_secret(const std::string& secret) { - DCHECK(CalledOnValidThread()); - shared_secret_ = secret; -} - -const std::string& JingleSession::shared_secret() { - DCHECK(CalledOnValidThread()); - return shared_secret_; -} - - void JingleSession::Close() { DCHECK(CalledOnValidThread()); @@ -503,6 +492,7 @@ void JingleSession::OnChannelConnectorFinished( DCHECK(CalledOnValidThread()); DCHECK_EQ(channel_connectors_[name], connector); channel_connectors_[name] = NULL; + delete connector; } void JingleSession::CreateChannels() { |