Non-constraint interfaces for all constrainable interfaces

webrtc/api/mediaconstraintsinterface.h

Index: webrtc/api/mediaconstraintsinterface.h
diff --git a/webrtc/api/mediaconstraintsinterface.h b/webrtc/api/mediaconstraintsinterface.h
index 0c251f879387c7189120e6cb3601e5e42232dc12..a87589c09cd06291a1cd0a13980262b18334e9a1 100644
--- a/webrtc/api/mediaconstraintsinterface.h
+++ b/webrtc/api/mediaconstraintsinterface.h
@@ -13,12 +13,19 @@
 // http://www.w3.org/TR/mediacapture-streams/#mediastreamconstraints and also
 // used in WebRTC: http://dev.w3.org/2011/webrtc/editor/webrtc.html#constraints.
 
+// This interface is being deprecated in Chrome, and may be removed
+// from WebRTC too.
+// https://bugs.chromium.org/p/webrtc/issues/detail?id=5617
+
 #ifndef WEBRTC_API_MEDIACONSTRAINTSINTERFACE_H_
 #define WEBRTC_API_MEDIACONSTRAINTSINTERFACE_H_
 
 #include <string>
 #include <vector>
 
+#include "webrtc/base/optional.h"
+#include "webrtc/api/peerconnectioninterface.h"
+
 namespace webrtc {
 
 // MediaConstraintsInterface
@@ -118,6 +125,23 @@ bool FindConstraint(const MediaConstraintsInterface* constraints,
                     const std::string& key, bool* value,
                     size_t* mandatory_constraints);
 
+bool FindConstraint(const MediaConstraintsInterface* constraints,
+                    const std::string& key,
+                    int* value,
+                    size_t* mandatory_constraints);
+
+rtc::Optional<bool> ConstraintToOptionalBool(
+    const MediaConstraintsInterface* constraints,
+    const std::string& key);
+rtc::Optional<int> ConstraintToOptionalInt(
+    const MediaConstraintsInterface* constraints,
+    const std::string& key);
+
+// Copy all relevant constraints into an RTCConfiguration object.
+void CopyConstraintsIntoRtcConfiguration(
+    const MediaConstraintsInterface* constraints,
+    PeerConnectionInterface::RTCConfiguration* configuration);
+
 }  // namespace webrtc
 
 #endif  // WEBRTC_API_MEDIACONSTRAINTSINTERFACE_H_