Simplify IqRequest interface.

This is neccessary to make the interface usable with stanzas generated
by JingleMessage::ToXml().

BUG=None
TEST=Unittests

Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=99801

Review URL: http://codereview.chromium.org/7809003

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@99851 0039d316-1c4b-4281-b951-d872f2087c98

4 files changed, 24 insertions, 10 deletions

diff --git a/remoting/host/heartbeat_sender.cc b/remoting/host/heartbeat_sender.cc
index 182c06e..32ddd49 100644
--- a/remoting/host/heartbeat_sender.cc
+++ b/remoting/host/heartbeat_sender.cc
@@ -101,7 +101,8 @@ void HeartbeatSender::DoSendStanza() {
   DCHECK_EQ(state_, STARTED);
 
   VLOG(1) << "Sending heartbeat stanza to " << kChromotingBotJid;
-  request_->SendIq(buzz::STR_SET, kChromotingBotJid, CreateHeartbeatMessage());
+  request_->SendIq(IqRequest::MakeIqStanza(
+      buzz::STR_SET, kChromotingBotJid, CreateHeartbeatMessage()));
 }
 
 void HeartbeatSender::ProcessResponse(const XmlElement* response) {
diff --git a/remoting/host/heartbeat_sender_unittest.cc b/remoting/host/heartbeat_sender_unittest.cc
index 8818c156..49933c2 100644
--- a/remoting/host/heartbeat_sender_unittest.cc
+++ b/remoting/host/heartbeat_sender_unittest.cc
@@ -27,6 +27,7 @@ using testing::DoAll;
 using testing::Invoke;
 using testing::NotNull;
 using testing::Return;
+using testing::SaveArg;
 
 namespace remoting {
 
@@ -50,7 +51,7 @@ class HeartbeatSenderTest : public testing::Test {
 };
 
 // Call Start() followed by Stop(), and makes sure an Iq stanza is
-// being send.
+// being sent.
 TEST_F(HeartbeatSenderTest, DoSendStanza) {
   // |iq_request| is freed by HeartbeatSender.
   MockIqRequest* iq_request = new MockIqRequest();
@@ -66,12 +67,20 @@ TEST_F(HeartbeatSenderTest, DoSendStanza) {
   EXPECT_CALL(signal_strategy_, CreateIqRequest())
       .WillOnce(Return(iq_request));
 
-  EXPECT_CALL(*iq_request, SendIq(buzz::STR_SET, kChromotingBotJid, NotNull()))
-      .WillOnce(DoAll(DeleteArg<2>(), Return()));
+  XmlElement* sent_iq = NULL;
+  EXPECT_CALL(*iq_request, SendIq(NotNull()))
+      .WillOnce(SaveArg<0>(&sent_iq));
 
   heartbeat_sender->OnSignallingConnected(&signal_strategy_, kTestJid);
   message_loop_.RunAllPending();
 
+  scoped_ptr<XmlElement> stanza(sent_iq);
+  ASSERT_TRUE(stanza != NULL);
+
+  EXPECT_EQ(stanza->Attr(buzz::QName("", "to")),
+            std::string(kChromotingBotJid));
+  EXPECT_EQ(stanza->Attr(buzz::QName("", "type")), "set");
+
   heartbeat_sender->OnSignallingDisconnected();
   message_loop_.RunAllPending();
 }
diff --git a/remoting/host/register_support_host_request.cc b/remoting/host/register_support_host_request.cc
index 3c47dab..38d3c4a 100644
--- a/remoting/host/register_support_host_request.cc
+++ b/remoting/host/register_support_host_request.cc
@@ -63,8 +63,8 @@ void RegisterSupportHostRequest::OnSignallingConnected(
   request_->set_callback(base::Bind(
       &RegisterSupportHostRequest::ProcessResponse, base::Unretained(this)));
 
-  request_->SendIq(buzz::STR_SET, kChromotingBotJid,
-                   CreateRegistrationRequest(jid));
+  request_->SendIq(IqRequest::MakeIqStanza(
+      buzz::STR_SET, kChromotingBotJid, CreateRegistrationRequest(jid)));
 }
 
 void RegisterSupportHostRequest::OnSignallingDisconnected() {
diff --git a/remoting/host/register_support_host_request_unittest.cc b/remoting/host/register_support_host_request_unittest.cc
index 50c305a..57c83b2 100644
--- a/remoting/host/register_support_host_request_unittest.cc
+++ b/remoting/host/register_support_host_request_unittest.cc
@@ -76,8 +76,8 @@ TEST_F(RegisterSupportHostRequestTest, Send) {
       .WillOnce(Return(iq_request));
 
   XmlElement* sent_iq = NULL;
-  EXPECT_CALL(*iq_request, SendIq(buzz::STR_SET, kChromotingBotJid, NotNull()))
-      .WillOnce(SaveArg<2>(&sent_iq));
+  EXPECT_CALL(*iq_request, SendIq(NotNull()))
+      .WillOnce(SaveArg<0>(&sent_iq));
 
   request->OnSignallingConnected(&signal_strategy_, kTestJid);
   message_loop_.RunAllPending();
@@ -86,11 +86,15 @@ TEST_F(RegisterSupportHostRequestTest, Send) {
   scoped_ptr<XmlElement> stanza(sent_iq);
   ASSERT_TRUE(stanza != NULL);
 
+  EXPECT_EQ(stanza->Attr(buzz::QName("", "to")),
+            std::string(kChromotingBotJid));
+  EXPECT_EQ(stanza->Attr(buzz::QName("", "type")), "set");
+
   EXPECT_EQ(QName(kChromotingXmlNamespace, "register-support-host"),
-            stanza->Name());
+            stanza->FirstElement()->Name());
 
   QName signature_tag(kChromotingXmlNamespace, "signature");
-  XmlElement* signature = stanza->FirstNamed(signature_tag);
+  XmlElement* signature = stanza->FirstElement()->FirstNamed(signature_tag);
   ASSERT_TRUE(signature != NULL);
   EXPECT_TRUE(stanza->NextNamed(signature_tag) == NULL);