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

webrtc/api/objc/RTCMediaConstraints.mm

 /*
  *  Copyright 2015 The WebRTC project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
 #import "RTCMediaConstraints.h"
 
 #import "webrtc/api/objc/RTCMediaConstraints+Private.h"
 #import "webrtc/base/objc/NSString+StdString.h"
 
-// TODO(hjon): Update nullability types. See http://crbug/webrtc/5592
-
 namespace webrtc {
 
 MediaConstraints::~MediaConstraints() {}
 
 MediaConstraints::MediaConstraints() {}
 
 MediaConstraints::MediaConstraints(
     const MediaConstraintsInterface::Constraints& mandatory,
     const MediaConstraintsInterface::Constraints& optional)
     : mandatory_(mandatory), optional_(optional) {}
 
 const MediaConstraintsInterface::Constraints&
 MediaConstraints::GetMandatory() const {
   return mandatory_;
 }
 
 const MediaConstraintsInterface::Constraints&
 MediaConstraints::GetOptional() const {
   return optional_;
 }
 
 }  // namespace webrtc
 
 
 @implementation RTCMediaConstraints {
-  NSDictionary *_mandatory;
-  // NSDictionary<NSString *, NSString *> *_mandatory;
-  NSDictionary *_optional;
-  // NSDictionary<NSString *, NSString *> *_optional;
+  NSDictionary<NSString *, NSString *> *_mandatory;
+  NSDictionary<NSString *, NSString *> *_optional;
 }
 
 - (instancetype)initWithMandatoryConstraints:
-    (NSDictionary *)mandatory
-    // (NSDictionary<NSString *, NSString *> *)mandatory
+    (NSDictionary<NSString *, NSString *> *)mandatory
                          optionalConstraints:
-    (NSDictionary *)optional {
-    // (NSDictionary<NSString *, NSString *> *)optional {
+    (NSDictionary<NSString *, NSString *> *)optional {
   if (self = [super init]) {
     _mandatory = [[NSDictionary alloc] initWithDictionary:mandatory
                                                 copyItems:YES];
     _optional = [[NSDictionary alloc] initWithDictionary:optional
                                                copyItems:YES];
   }
   return self;
 }
 
 - (NSString *)description {
@@ skipping 10 matching lines @@
   webrtc::MediaConstraintsInterface::Constraints optional =
       [[self class] nativeConstraintsForConstraints:_optional];
 
   webrtc::MediaConstraints *nativeConstraints =
       new webrtc::MediaConstraints(mandatory, optional);
   return rtc::scoped_ptr<webrtc::MediaConstraints>(nativeConstraints);
 }
 
 + (webrtc::MediaConstraintsInterface::Constraints)
     nativeConstraintsForConstraints:
-        (NSDictionary *)constraints {
-        // (NSDictionary<NSString *, NSString *> *)constraints {
+        (NSDictionary<NSString *, NSString *> *)constraints {
   webrtc::MediaConstraintsInterface::Constraints nativeConstraints;
   for (NSString *key in constraints) {
     NSAssert([key isKindOfClass:[NSString class]],
              @"%@ is not an NSString.", key);
     NSString *value = [constraints objectForKey:key];
     NSAssert([value isKindOfClass:[NSString class]],
              @"%@ is not an NSString.", value);
     nativeConstraints.push_back(webrtc::MediaConstraintsInterface::Constraint(
         key.stdString, value.stdString));
   }
   return nativeConstraints;
 }
 
 @end