Use new callbacks in the 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 39 matching lines @@
     VLOG(1) << "Dropping IQ packet with no request id: " << stanza->Str();
   } else {
     // TODO(ajwong): We should look at the logic inside libjingle's
     // XmppTask::MatchResponseIq() and make sure we're fully in sync.
     // They check more fields and conditions than us.
 
     // TODO(ajwong): This logic is weird.  We add to the register in
     // JavascriptIqRequest::SendIq(), but remove in
     // JavascriptIqRegistry::OnIq().  We should try to keep the
     // registration/deregistration in one spot.
-    if (it->second->callback_.get()) {
-      it->second->callback_->Run(stanza);
+    if (it->second->callback_.is_null()) {
+      it->second->callback_.Run(stanza);
+      it->second->callback_.Reset();
     } else {
       VLOG(1) << "No callback, so dropping: " << stanza->Str();
     }
     requests_.erase(it);
   }
 }
 
 void JavascriptIqRegistry::RegisterRequest(
     JavascriptIqRequest* request, const std::string& id) {
   DCHECK(requests_.find(id) == requests_.end());
@@ skipping 11 matching lines @@
 }
 
 void JavascriptIqRequest::SendIq(const std::string& type,
                                  const std::string& addressee,
                                  buzz::XmlElement* iq_body) {
   std::string id = signal_strategy_->GetNextId();
   registry_->RegisterRequest(this, id);
   signal_strategy_->SendStanza(MakeIqStanza(type, addressee, iq_body, id));
 }
 
-void JavascriptIqRequest::set_callback(ReplyCallback* callback) {
-  callback_.reset(callback);
+void JavascriptIqRequest::set_callback(const ReplyCallback& callback) {
+  callback_ = callback;
 }
 
 }  // namespace remoting