diff options
author | sergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-01 20:54:32 +0000 |
---|---|---|
committer | sergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-01 20:54:32 +0000 |
commit | 10c94b3a6c2d47dbcb3be355dcbcaae0f8b024c6 (patch) | |
tree | 43da6baae2611225bf46bc65367dfc63fe895b43 /remoting/protocol/jingle_chromoting_server.cc | |
parent | e326bb9ab32dea06c9419ee774a9a893fb02da52 (diff) | |
download | chromium_src-10c94b3a6c2d47dbcb3be355dcbcaae0f8b024c6.zip chromium_src-10c94b3a6c2d47dbcb3be355dcbcaae0f8b024c6.tar.gz chromium_src-10c94b3a6c2d47dbcb3be355dcbcaae0f8b024c6.tar.bz2 |
Unittests for chromotocol code.
BUG=53986
TEST=Unittests FTW!
Review URL: http://codereview.chromium.org/3407007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@61228 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting/protocol/jingle_chromoting_server.cc')
-rw-r--r-- | remoting/protocol/jingle_chromoting_server.cc | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/remoting/protocol/jingle_chromoting_server.cc b/remoting/protocol/jingle_chromoting_server.cc index 851221f..517967f 100644 --- a/remoting/protocol/jingle_chromoting_server.cc +++ b/remoting/protocol/jingle_chromoting_server.cc @@ -6,6 +6,7 @@ #include "base/message_loop.h" #include "remoting/base/constants.h" +#include "third_party/libjingle/source/talk/p2p/base/constants.h" #include "third_party/libjingle/source/talk/p2p/base/transport.h" #include "third_party/libjingle/source/talk/xmllite/xmlelement.h" @@ -125,7 +126,7 @@ void JingleChromotingServer::OnSessionCreate( DCHECK_EQ(message_loop(), MessageLoop::current()); // Allow local connections if neccessary. - session->transport()->set_allow_local_ips(allow_local_ips_); + session->set_allow_local_ips(allow_local_ips_); // If this is an outcoming session, the the connection object is already // created. @@ -161,10 +162,11 @@ void JingleChromotingServer::AcceptConnection( if (accept) session->Accept(CreateSessionDescription()); else - session->Reject(); + session->Reject(cricket::STR_TERMINATE_DECLINE); } bool JingleChromotingServer::ParseContent( + cricket::SignalingProtocol protocol, const buzz::XmlElement* element, const cricket::ContentDescription** content, cricket::ParseError* error) { @@ -190,6 +192,7 @@ bool JingleChromotingServer::ParseContent( // TODO(sergeyu): Add more information to the content description. E.g. // protocol version, etc. bool JingleChromotingServer::WriteContent( + cricket::SignalingProtocol protocol, const cricket::ContentDescription* content, buzz::XmlElement** elem, cricket::WriteError* error) { |