Revert 99801 - Simplify IqRequest interface.

remoting/jingle_glue/xmpp_iq_request.cc

Index: remoting/jingle_glue/xmpp_iq_request.cc
===================================================================
--- remoting/jingle_glue/xmpp_iq_request.cc	(revision 99806)
+++ remoting/jingle_glue/xmpp_iq_request.cc	(working copy)
@@ -25,14 +25,20 @@
   Unregister();
 }
 
-void XmppIqRequest::SendIq(buzz::XmlElement* stanza) {
+void XmppIqRequest::SendIq(const std::string& type,
+                       const std::string& addressee,
+                       buzz::XmlElement* iq_body) {
   DCHECK_EQ(MessageLoop::current(), message_loop_);
 
   // Unregister the handler if it is already registered.
   Unregister();
 
-  stanza->AddAttr(buzz::QN_ID, xmpp_client_->NextId());
-  xmpp_client_->engine()->SendIq(stanza, this, &cookie_);
+  DCHECK_GT(type.length(), 0U);
+
+  scoped_ptr<buzz::XmlElement> stanza(MakeIqStanza(type, addressee, iq_body,
+                                                   xmpp_client_->NextId()));
+
+  xmpp_client_->engine()->SendIq(stanza.get(), this, &cookie_);
 }
 
 void XmppIqRequest::set_callback(const ReplyCallback& callback) {