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

Side by Side Diff: webrtc/api/webrtcsession.h

Issue 1920043002: Replace scoped_ptr with unique_ptr in webrtc/base/ (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Rebased Created 4 years, 7 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 unified diff | Download patch
« no previous file with comments | « webrtc/api/test/fakedtlsidentitystore.h ('k') | webrtc/api/webrtcsession.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright 2012 The WebRTC project authors. All Rights Reserved. 2 * Copyright 2012 The WebRTC project authors. All Rights Reserved.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license 4 * Use of this source code is governed by a BSD-style license
5 * that can be found in the LICENSE file in the root of the source 5 * that can be found in the LICENSE file in the root of the source
6 * tree. An additional intellectual property rights grant can be found 6 * tree. An additional intellectual property rights grant can be found
7 * in the file PATENTS. All contributing project authors may 7 * in the file PATENTS. All contributing project authors may
8 * be found in the AUTHORS file in the root of the source tree. 8 * be found in the AUTHORS file in the root of the source tree.
9 */ 9 */
10 10
11 #ifndef WEBRTC_API_WEBRTCSESSION_H_ 11 #ifndef WEBRTC_API_WEBRTCSESSION_H_
12 #define WEBRTC_API_WEBRTCSESSION_H_ 12 #define WEBRTC_API_WEBRTCSESSION_H_
13 13
14 #include <memory>
14 #include <set> 15 #include <set>
15 #include <string> 16 #include <string>
16 #include <vector> 17 #include <vector>
17 18
18 #include "webrtc/api/datachannel.h" 19 #include "webrtc/api/datachannel.h"
19 #include "webrtc/api/dtmfsender.h" 20 #include "webrtc/api/dtmfsender.h"
20 #include "webrtc/api/mediacontroller.h" 21 #include "webrtc/api/mediacontroller.h"
21 #include "webrtc/api/mediastreamprovider.h" 22 #include "webrtc/api/mediastreamprovider.h"
22 #include "webrtc/api/peerconnectioninterface.h" 23 #include "webrtc/api/peerconnectioninterface.h"
23 #include "webrtc/api/statstypes.h" 24 #include "webrtc/api/statstypes.h"
(...skipping 262 matching lines...) Expand 10 before | Expand all | Expand 10 after
286 287
287 // Get stats for a specific channel 288 // Get stats for a specific channel
288 bool GetChannelTransportStats(cricket::BaseChannel* ch, SessionStats* stats); 289 bool GetChannelTransportStats(cricket::BaseChannel* ch, SessionStats* stats);
289 290
290 // virtual so it can be mocked in unit tests 291 // virtual so it can be mocked in unit tests
291 virtual bool GetLocalCertificate( 292 virtual bool GetLocalCertificate(
292 const std::string& transport_name, 293 const std::string& transport_name,
293 rtc::scoped_refptr<rtc::RTCCertificate>* certificate); 294 rtc::scoped_refptr<rtc::RTCCertificate>* certificate);
294 295
295 // Caller owns returned certificate 296 // Caller owns returned certificate
296 virtual rtc::scoped_ptr<rtc::SSLCertificate> GetRemoteSSLCertificate( 297 virtual std::unique_ptr<rtc::SSLCertificate> GetRemoteSSLCertificate(
297 const std::string& transport_name); 298 const std::string& transport_name);
298 299
299 cricket::DataChannelType data_channel_type() const; 300 cricket::DataChannelType data_channel_type() const;
300 301
301 bool IceRestartPending(const std::string& content_name) const; 302 bool IceRestartPending(const std::string& content_name) const;
302 303
303 // Called when an RTCCertificate is generated or retrieved by 304 // Called when an RTCCertificate is generated or retrieved by
304 // WebRTCSessionDescriptionFactory. Should happen before setLocalDescription. 305 // WebRTCSessionDescriptionFactory. Should happen before setLocalDescription.
305 void OnCertificateReady( 306 void OnCertificateReady(
306 const rtc::scoped_refptr<rtc::RTCCertificate>& certificate); 307 const rtc::scoped_refptr<rtc::RTCCertificate>& certificate);
(...skipping 207 matching lines...) Expand 10 before | Expand all | Expand 10 after
514 PeerConnectionInterface::BundlePolicy bundle_policy_; 515 PeerConnectionInterface::BundlePolicy bundle_policy_;
515 516
516 // Declares the RTCP mux policy for the WebRTCSession. 517 // Declares the RTCP mux policy for the WebRTCSession.
517 PeerConnectionInterface::RtcpMuxPolicy rtcp_mux_policy_; 518 PeerConnectionInterface::RtcpMuxPolicy rtcp_mux_policy_;
518 519
519 RTC_DISALLOW_COPY_AND_ASSIGN(WebRtcSession); 520 RTC_DISALLOW_COPY_AND_ASSIGN(WebRtcSession);
520 }; 521 };
521 } // namespace webrtc 522 } // namespace webrtc
522 523
523 #endif // WEBRTC_API_WEBRTCSESSION_H_ 524 #endif // WEBRTC_API_WEBRTCSESSION_H_
OLDNEW
« no previous file with comments | « webrtc/api/test/fakedtlsidentitystore.h ('k') | webrtc/api/webrtcsession.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698