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

Side by Side Diff: webrtc/sdk/objc/Framework/UnitTests/RTCMediaConstraintsTest.mm

Issue 1937693002: Replace scoped_ptr with unique_ptr everywhere (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@unique5
Patch Set: 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
OLDNEW
1 /* 1 /*
2 * Copyright 2015 The WebRTC project authors. All Rights Reserved. 2 * Copyright 2015 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 #import <Foundation/Foundation.h> 11 #import <Foundation/Foundation.h>
12 12
13 #include <memory>
14
13 #include "webrtc/base/gunit.h" 15 #include "webrtc/base/gunit.h"
14 16
15 #import "NSString+StdString.h" 17 #import "NSString+StdString.h"
16 #import "RTCMediaConstraints+Private.h" 18 #import "RTCMediaConstraints+Private.h"
17 #import "WebRTC/RTCMediaConstraints.h" 19 #import "WebRTC/RTCMediaConstraints.h"
18 20
19 @interface RTCMediaConstraintsTest : NSObject 21 @interface RTCMediaConstraintsTest : NSObject
20 - (void)testMediaConstraints; 22 - (void)testMediaConstraints;
21 @end 23 @end
22 24
23 @implementation RTCMediaConstraintsTest 25 @implementation RTCMediaConstraintsTest
24 26
25 - (void)testMediaConstraints { 27 - (void)testMediaConstraints {
26 NSDictionary *mandatory = @{@"key1": @"value1", @"key2": @"value2"}; 28 NSDictionary *mandatory = @{@"key1": @"value1", @"key2": @"value2"};
27 NSDictionary *optional = @{@"key3": @"value3", @"key4": @"value4"}; 29 NSDictionary *optional = @{@"key3": @"value3", @"key4": @"value4"};
28 30
29 RTCMediaConstraints *constraints = [[RTCMediaConstraints alloc] 31 RTCMediaConstraints *constraints = [[RTCMediaConstraints alloc]
30 initWithMandatoryConstraints:mandatory 32 initWithMandatoryConstraints:mandatory
31 optionalConstraints:optional]; 33 optionalConstraints:optional];
32 rtc::scoped_ptr<webrtc::MediaConstraints> nativeConstraints = 34 std::unique_ptr<webrtc::MediaConstraints> nativeConstraints =
33 [constraints nativeConstraints]; 35 [constraints nativeConstraints];
34 36
35 webrtc::MediaConstraintsInterface::Constraints nativeMandatory = 37 webrtc::MediaConstraintsInterface::Constraints nativeMandatory =
36 nativeConstraints->GetMandatory(); 38 nativeConstraints->GetMandatory();
37 [self expectConstraints:mandatory inNativeConstraints:nativeMandatory]; 39 [self expectConstraints:mandatory inNativeConstraints:nativeMandatory];
38 40
39 webrtc::MediaConstraintsInterface::Constraints nativeOptional = 41 webrtc::MediaConstraintsInterface::Constraints nativeOptional =
40 nativeConstraints->GetOptional(); 42 nativeConstraints->GetOptional();
41 [self expectConstraints:optional inNativeConstraints:nativeOptional]; 43 [self expectConstraints:optional inNativeConstraints:nativeOptional];
42 } 44 }
(...skipping 14 matching lines...) Expand all
57 } 59 }
58 60
59 @end 61 @end
60 62
61 TEST(RTCMediaConstraintsTest, MediaConstraintsTest) { 63 TEST(RTCMediaConstraintsTest, MediaConstraintsTest) {
62 @autoreleasepool { 64 @autoreleasepool {
63 RTCMediaConstraintsTest *test = [[RTCMediaConstraintsTest alloc] init]; 65 RTCMediaConstraintsTest *test = [[RTCMediaConstraintsTest alloc] init];
64 [test testMediaConstraints]; 66 [test testMediaConstraints];
65 } 67 }
66 } 68 }
OLDNEW
« no previous file with comments | « webrtc/sdk/objc/Framework/UnitTests/RTCIceCandidateTest.mm ('k') | webrtc/system_wrappers/include/aligned_malloc.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698