summaryrefslogtreecommitdiffstats
path: root/remoting/protocol/pepper_session_manager.cc
diff options
context:
space:
mode:
authorsergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-11-04 01:00:49 +0000
committersergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-11-04 01:00:49 +0000
commitb39e182dca78d0c165ba75bb04878f4eb71b3625 (patch)
treec8f3d4f74b05cdb50b4d5244620595a758d8a996 /remoting/protocol/pepper_session_manager.cc
parentdc01874febf63d62bd05178f168f5459fec05372 (diff)
downloadchromium_src-b39e182dca78d0c165ba75bb04878f4eb71b3625.zip
chromium_src-b39e182dca78d0c165ba75bb04878f4eb71b3625.tar.gz
chromium_src-b39e182dca78d0c165ba75bb04878f4eb71b3625.tar.bz2
Refactor IqRequest.
Remove CreateIqRequest from SignalStrategy interface. Intead to send an Iq stanza the new IqSender now need to be used. IqSender creats of IqRequest objects and handling iq responses. BUG=None TEST=Unittests. Review URL: http://codereview.chromium.org/8432009 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@108606 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting/protocol/pepper_session_manager.cc')
-rw-r--r--remoting/protocol/pepper_session_manager.cc17
1 files changed, 7 insertions, 10 deletions
diff --git a/remoting/protocol/pepper_session_manager.cc b/remoting/protocol/pepper_session_manager.cc
index 7e7fe69..ea095c3 100644
--- a/remoting/protocol/pepper_session_manager.cc
+++ b/remoting/protocol/pepper_session_manager.cc
@@ -5,6 +5,7 @@
#include "remoting/protocol/pepper_session_manager.h"
#include "base/bind.h"
+#include "remoting/jingle_glue/iq_sender.h"
#include "remoting/jingle_glue/jingle_info_request.h"
#include "remoting/jingle_glue/signal_strategy.h"
#include "remoting/protocol/jingle_messages.h"
@@ -38,18 +39,18 @@ void PepperSessionManager::Init(
listener_ = listener;
local_jid_ = local_jid;
signal_strategy_ = signal_strategy;
+ iq_sender_.reset(new IqSender(signal_strategy_));
private_key_.reset(private_key);
certificate_ = certificate;
allow_nat_traversal_ = allow_nat_traversal;
- signal_strategy_->SetListener(this);
+ signal_strategy_->AddListener(this);
// If NAT traversal is enabled then we need to request STUN/Relay info.
if (allow_nat_traversal) {
- jingle_info_request_.reset(
- new JingleInfoRequest(signal_strategy_->CreateIqRequest()));
- jingle_info_request_->Send(base::Bind(
- &PepperSessionManager::OnJingleInfo, base::Unretained(this)));
+ jingle_info_request_.reset(new JingleInfoRequest(signal_strategy_));
+ jingle_info_request_->Send(base::Bind(&PepperSessionManager::OnJingleInfo,
+ base::Unretained(this)));
} else {
listener_->OnSessionManagerInitialized();
}
@@ -95,7 +96,7 @@ void PepperSessionManager::Close() {
listener_ = NULL;
jingle_info_request_.reset();
- signal_strategy_->SetListener(NULL);
+ signal_strategy_->RemoveListener(this);
}
bool PepperSessionManager::OnIncomingStanza(const buzz::XmlElement* stanza) {
@@ -128,10 +129,6 @@ bool PepperSessionManager::OnIncomingStanza(const buzz::XmlElement* stanza) {
return true;
}
-IqRequest* PepperSessionManager::CreateIqRequest() {
- return signal_strategy_->CreateIqRequest();
-}
-
void PepperSessionManager::SendReply(const buzz::XmlElement* original_stanza,
const JingleMessageReply& reply) {
buzz::XmlElement* stanza = reply.ToXml(original_stanza);