commit 32e0c01b331e330195393544f8b38362d53afbcd
author Jon Hjelle <hjon@andyet.net> Tue Mar 08 16:04:46 2016 -0800
committer Zeke Chin <tkchin@webrtc.org> Wed Mar 09 00:04:56 2016 +0000
tree e943a50207dd8e457fb3bbdb0bbeaffdb2cf8869
parent 7e749949776f9da58e8a1a8815eaa638c6510198

Restore type attributes and remove extraneous nullability annotations for Objective-C Mac build

BUG=webrtc:5592
R=tkchin@webrtc.org

Review URL: https://codereview.webrtc.org/1773743002 .

Patch from Jon Hjelle <hjon@andyet.net>.

Cr-Commit-Position: refs/heads/master@{#11922}

webrtc/api/objc/RTCMediaConstraints.h

diff --git a/webrtc/api/objc/RTCMediaConstraints.h b/webrtc/api/objc/RTCMediaConstraints.h
index 1ed456c..a8ad391 100644
--- a/webrtc/api/objc/RTCMediaConstraints.h
+++ b/webrtc/api/objc/RTCMediaConstraints.h
@@ -11,23 +11,17 @@
 #import <Foundation/Foundation.h>
 
 NS_ASSUME_NONNULL_BEGIN
-// TODO(hjon): Update nullability types. See http://crbug/webrtc/5592
 
 @interface RTCMediaConstraints : NSObject
 
-- (nonnull instancetype)init NS_UNAVAILABLE;
+- (instancetype)init NS_UNAVAILABLE;
 
 /** Initialize with mandatory and/or optional constraints. */
-- (nonnull instancetype)initWithMandatoryConstraints:
-    (nullable NSDictionary *)mandatory
-                                 optionalConstraints:
-    (nullable NSDictionary *)optional
+- (instancetype)initWithMandatoryConstraints:
+    (nullable NSDictionary<NSString *, NSString *> *)mandatory
+                         optionalConstraints:
+    (nullable NSDictionary<NSString *, NSString *> *)optional
     NS_DESIGNATED_INITIALIZER;
-// - (instancetype)initWithMandatoryConstraints:
-//     (nullable NSDictionary<NSString *, NSString *> *)mandatory
-//                          optionalConstraints:
-//     (nullable NSDictionary<NSString *, NSString *> *)optional
-//     NS_DESIGNATED_INITIALIZER;
 
 @end