Use new callbacks in the IqRequest interface.

remoting/jingle_glue/xmpp_iq_request.h

Index: remoting/jingle_glue/xmpp_iq_request.h
diff --git a/remoting/jingle_glue/xmpp_iq_request.h b/remoting/jingle_glue/xmpp_iq_request.h
index 2e1b8b441829385eb4c6fd0535c0f8d20015ba86..ce8d61bbb9cf3e29b98ce9db3e7dd821eb03b396 100644
--- a/remoting/jingle_glue/xmpp_iq_request.h
+++ b/remoting/jingle_glue/xmpp_iq_request.h
@@ -20,15 +20,13 @@ namespace remoting {
 
 class XmppIqRequest : public IqRequest, public buzz::XmppIqHandler {
  public:
-  typedef Callback1<const buzz::XmlElement*>::Type ReplyCallback;
-
   XmppIqRequest(MessageLoop* message_loop, buzz::XmppClient* xmpp_client);
   virtual ~XmppIqRequest();
 
   // IqRequest interface.
   virtual void SendIq(const std::string& type, const std::string& addressee,
                       buzz::XmlElement* iq_body) OVERRIDE;
-  virtual void set_callback(ReplyCallback* callback) OVERRIDE;
+  virtual void set_callback(const ReplyCallback& callback) OVERRIDE;
 
   // buzz::XmppIqHandler interface.
   virtual void IqResponse(buzz::XmppIqCookie cookie,
@@ -44,7 +42,7 @@ class XmppIqRequest : public IqRequest, public buzz::XmppIqHandler {
   MessageLoop* message_loop_;
   buzz::XmppClient* xmpp_client_;
   buzz::XmppIqCookie cookie_;
-  scoped_ptr<ReplyCallback> callback_;
+  ReplyCallback callback_;
 };
 
 }  // namespace remoting