Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(226)

Unified Diff: remoting/protocol/webrtc_transport.h

Issue 1864213002: Convert //remoting to use std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Mac IWYU Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « remoting/protocol/webrtc_data_stream_adapter.cc ('k') | remoting/protocol/webrtc_transport.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/protocol/webrtc_transport.h
diff --git a/remoting/protocol/webrtc_transport.h b/remoting/protocol/webrtc_transport.h
index f3d2cefa52bd7911a426dc0a2505c29684d00355..c78aad71531a16f6952b49c77d194f93a7a24178 100644
--- a/remoting/protocol/webrtc_transport.h
+++ b/remoting/protocol/webrtc_transport.h
@@ -5,9 +5,10 @@
#ifndef REMOTING_PROTOCOL_WEBRTC_TRANSPORT_H_
#define REMOTING_PROTOCOL_WEBRTC_TRANSPORT_H_
+#include <memory>
+
#include "base/macros.h"
#include "base/memory/ref_counted.h"
-#include "base/memory/scoped_ptr.h"
#include "base/memory/scoped_vector.h"
#include "base/memory/weak_ptr.h"
#include "base/threading/thread_checker.h"
@@ -82,7 +83,7 @@ class WebrtcTransport : public Transport,
private:
void OnLocalSessionDescriptionCreated(
- scoped_ptr<webrtc::SessionDescriptionInterface> description,
+ std::unique_ptr<webrtc::SessionDescriptionInterface> description,
const std::string& error);
void OnLocalDescriptionSet(bool success, const std::string& error);
void OnRemoteDescriptionSet(bool send_answer,
@@ -119,7 +120,7 @@ class WebrtcTransport : public Transport,
crypto::HMAC handshake_hmac_;
- scoped_ptr<webrtc::FakeAudioDeviceModule> fake_audio_device_module_;
+ std::unique_ptr<webrtc::FakeAudioDeviceModule> fake_audio_device_module_;
rtc::scoped_refptr<webrtc::PeerConnectionFactoryInterface>
peer_connection_factory_;
@@ -129,7 +130,7 @@ class WebrtcTransport : public Transport,
bool connected_ = false;
- scoped_ptr<buzz::XmlElement> pending_transport_info_message_;
+ std::unique_ptr<buzz::XmlElement> pending_transport_info_message_;
base::OneShotTimer transport_info_timer_;
ScopedVector<webrtc::IceCandidateInterface> pending_incoming_candidates_;
« no previous file with comments | « remoting/protocol/webrtc_data_stream_adapter.cc ('k') | remoting/protocol/webrtc_transport.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698