| Index: remoting/signaling/xmpp_stream_parser.h
|
| diff --git a/remoting/signaling/xmpp_stream_parser.h b/remoting/signaling/xmpp_stream_parser.h
|
| index b05d127460e9a0656ce10368a520767f68391f8a..de8959e66a002fd09384f0882339b5f19a262c8f 100644
|
| --- a/remoting/signaling/xmpp_stream_parser.h
|
| +++ b/remoting/signaling/xmpp_stream_parser.h
|
| @@ -5,11 +5,11 @@
|
| #ifndef REMOTING_SIGNALING_XMPP_STREAM_PARSER_H_
|
| #define REMOTING_SIGNALING_XMPP_STREAM_PARSER_H_
|
|
|
| +#include <memory>
|
| #include <string>
|
|
|
| #include "base/callback.h"
|
| #include "base/macros.h"
|
| -#include "base/memory/scoped_ptr.h"
|
|
|
| namespace buzz {
|
| class XmlElement;
|
| @@ -22,7 +22,7 @@ namespace remoting {
|
| // |on_error_callback| specified using SetCallbacks().
|
| class XmppStreamParser {
|
| public:
|
| - typedef base::Callback<void(scoped_ptr<buzz::XmlElement> stanza)>
|
| + typedef base::Callback<void(std::unique_ptr<buzz::XmlElement> stanza)>
|
| OnStanzaCallback;
|
|
|
| XmppStreamParser();
|
| @@ -36,7 +36,7 @@ class XmppStreamParser {
|
| private:
|
| class Core;
|
|
|
| - scoped_ptr<Core> core_;
|
| + std::unique_ptr<Core> core_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(XmppStreamParser);
|
| };
|
|
|