summaryrefslogtreecommitdiff
path: root/chromium/media/capture/video/mac/video_capture_device_mac_unittest.mm
diff options
context:
space:
mode:
Diffstat (limited to 'chromium/media/capture/video/mac/video_capture_device_mac_unittest.mm')
-rw-r--r--chromium/media/capture/video/mac/video_capture_device_mac_unittest.mm24
1 files changed, 12 insertions, 12 deletions
diff --git a/chromium/media/capture/video/mac/video_capture_device_mac_unittest.mm b/chromium/media/capture/video/mac/video_capture_device_mac_unittest.mm
index f690264dbf7..d5ed43a2bbf 100644
--- a/chromium/media/capture/video/mac/video_capture_device_mac_unittest.mm
+++ b/chromium/media/capture/video/mac/video_capture_device_mac_unittest.mm
@@ -15,15 +15,15 @@
Float64 _minFrameRate;
Float64 _maxFrameRate;
}
-- (id)initWithMinFrameRate:(Float64)minFrameRate
- maxFrameRate:(Float64)maxFrameRate;
+- (instancetype)initWithMinFrameRate:(Float64)minFrameRate
+ maxFrameRate:(Float64)maxFrameRate;
@end
@implementation FakeAVFrameRateRange
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wobjc-designated-initializers"
-- (id)initWithMinFrameRate:(Float64)minFrameRate
- maxFrameRate:(Float64)maxFrameRate {
+- (instancetype)initWithMinFrameRate:(Float64)minFrameRate
+ maxFrameRate:(Float64)maxFrameRate {
_minFrameRate = minFrameRate;
_maxFrameRate = maxFrameRate;
return self;
@@ -46,20 +46,20 @@
base::scoped_nsobject<FakeAVFrameRateRange> _frameRateRange1;
base::scoped_nsobject<FakeAVFrameRateRange> _frameRateRange2;
};
-- (id)initWithWidth:(int)width
- height:(int)height
- fourCC:(FourCharCode)fourCC
- frameRate:(Float64)frameRate;
+- (instancetype)initWithWidth:(int)width
+ height:(int)height
+ fourCC:(FourCharCode)fourCC
+ frameRate:(Float64)frameRate;
- (void)setSecondFrameRate:(Float64)frameRate;
@end
@implementation FakeAVCaptureDeviceFormat
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wobjc-designated-initializers"
-- (id)initWithWidth:(int)width
- height:(int)height
- fourCC:(FourCharCode)fourCC
- frameRate:(Float64)frameRate {
+- (instancetype)initWithWidth:(int)width
+ height:(int)height
+ fourCC:(FourCharCode)fourCC
+ frameRate:(Float64)frameRate {
CMVideoFormatDescriptionCreate(nullptr, fourCC, width, height, nullptr,
_formatDescription.InitializeInto());
_frameRateRange1.reset([[FakeAVFrameRateRange alloc]