summaryrefslogtreecommitdiff
path: root/chromium/third_party/webrtc/libjingle/xmpp/hangoutpubsubclient.h
diff options
context:
space:
mode:
Diffstat (limited to 'chromium/third_party/webrtc/libjingle/xmpp/hangoutpubsubclient.h')
-rw-r--r--chromium/third_party/webrtc/libjingle/xmpp/hangoutpubsubclient.h18
1 files changed, 9 insertions, 9 deletions
diff --git a/chromium/third_party/webrtc/libjingle/xmpp/hangoutpubsubclient.h b/chromium/third_party/webrtc/libjingle/xmpp/hangoutpubsubclient.h
index 2586768e2bd..fecc727604f 100644
--- a/chromium/third_party/webrtc/libjingle/xmpp/hangoutpubsubclient.h
+++ b/chromium/third_party/webrtc/libjingle/xmpp/hangoutpubsubclient.h
@@ -12,13 +12,13 @@
#define WEBRTC_LIBJINGLE_XMPP_HANGOUTPUBSUBCLIENT_H_
#include <map>
+#include <memory>
#include <string>
#include <vector>
#include "webrtc/libjingle/xmpp/jid.h"
#include "webrtc/libjingle/xmpp/pubsubclient.h"
#include "webrtc/libjingle/xmpp/pubsubstateclient.h"
-#include "webrtc/base/scoped_ptr.h"
#include "webrtc/base/sigslot.h"
#include "webrtc/base/sigslotrepeater.h"
@@ -163,14 +163,14 @@ class HangoutPubSubClient : public sigslot::has_slots<> {
const XmlElement* stanza);
Jid mucjid_;
std::string nick_;
- rtc::scoped_ptr<PubSubClient> media_client_;
- rtc::scoped_ptr<PubSubClient> presenter_client_;
- rtc::scoped_ptr<PubSubStateClient<bool> > presenter_state_client_;
- rtc::scoped_ptr<PubSubStateClient<bool> > audio_mute_state_client_;
- rtc::scoped_ptr<PubSubStateClient<bool> > video_mute_state_client_;
- rtc::scoped_ptr<PubSubStateClient<bool> > video_pause_state_client_;
- rtc::scoped_ptr<PubSubStateClient<bool> > recording_state_client_;
- rtc::scoped_ptr<PubSubStateClient<bool> > media_block_state_client_;
+ std::unique_ptr<PubSubClient> media_client_;
+ std::unique_ptr<PubSubClient> presenter_client_;
+ std::unique_ptr<PubSubStateClient<bool> > presenter_state_client_;
+ std::unique_ptr<PubSubStateClient<bool> > audio_mute_state_client_;
+ std::unique_ptr<PubSubStateClient<bool> > video_mute_state_client_;
+ std::unique_ptr<PubSubStateClient<bool> > video_pause_state_client_;
+ std::unique_ptr<PubSubStateClient<bool> > recording_state_client_;
+ std::unique_ptr<PubSubStateClient<bool> > media_block_state_client_;
};
} // namespace buzz