Revert 99801 - Simplify IqRequest interface.

remoting/jingle_glue/javascript_iq_request.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "remoting/jingle_glue/javascript_iq_request.h"
 
 #include "base/logging.h"
 #include "base/string_number_conversions.h"
 #include "remoting/jingle_glue/signal_strategy.h"
 #include "third_party/libjingle/source/talk/xmllite/xmlelement.h"
@@ skipping 65 matching lines @@
 JavascriptIqRequest::JavascriptIqRequest(SignalStrategy* signal_strategy,
                                          JavascriptIqRegistry* registry)
     : signal_strategy_(signal_strategy),
       registry_(registry) {
 }
 
 JavascriptIqRequest::~JavascriptIqRequest() {
   registry_->RemoveAllRequests(this);
 }
 
-void JavascriptIqRequest::SendIq(buzz::XmlElement* stanza) {
+void JavascriptIqRequest::SendIq(const std::string& type,
+                                 const std::string& addressee,
+                                 buzz::XmlElement* iq_body) {
   std::string id = signal_strategy_->GetNextId();
-  stanza->AddAttr(buzz::QN_ID, id);
   registry_->RegisterRequest(this, id);
-  signal_strategy_->SendStanza(stanza);
+  signal_strategy_->SendStanza(MakeIqStanza(type, addressee, iq_body, id));
 }
 
 void JavascriptIqRequest::set_callback(const ReplyCallback& callback) {
   callback_ = callback;
 }
 
 }  // namespace remoting