Remove old-style constraints from Chrome internals

third_party/WebKit/public/platform/WebMediaConstraints.h

 /*
  * Copyright (C) 2012 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 77 matching lines @@
     }
 
     bool matches(long value) const;
     bool isEmpty() const override;
     bool hasMandatory() const override;
     WebString toString() const override;
     bool hasMin() const { return m_hasMin; }
     long min() const { return m_min; }
     bool hasMax() const { return m_hasMax; }
     long max() const { return m_max; }
+    bool hasExact() const { return m_hasExact; }
+    long exact() const { return m_exact; }
 
 private:
     long m_min;
     long m_max;
     long m_exact;
     long m_ideal;
     unsigned m_hasMin : 1;
     unsigned m_hasMax : 1;
     unsigned m_hasExact : 1;
     unsigned m_hasIdeal : 1;
@@ skipping 33 matching lines @@
     }
 
     bool matches(double value) const;
     bool isEmpty() const override;
     bool hasMandatory() const override;
     WebString toString() const override;
     bool hasMin() const { return m_hasMin; }
     double min() const { return m_min; }
     bool hasMax() const { return m_hasMax; }
     double max() const { return m_max; }
+    bool hasExact() const { return m_hasExact; }
+    double exact() const { return m_exact; }
 
 private:
     double m_min;
     double m_max;
     double m_exact;
     double m_ideal;
     unsigned m_hasMin : 1;
     unsigned m_hasMax : 1;
     unsigned m_hasExact : 1;
     unsigned m_hasIdeal : 1;
@@ skipping 18 matching lines @@
     void setIdeal(const WebVector<WebString>& ideal)
     {
         m_ideal.assign(ideal);
     }
 
 
     bool matches(WebString value) const;
     bool isEmpty() const override;
     bool hasMandatory() const override;
     WebString toString() const override;
+    bool hasExact() const { return !m_exact.isEmpty(); }
     const WebVector<WebString>& exact() const;
     const WebVector<WebString>& ideal() const;
 
 private:
     WebVector<WebString> m_exact;
     WebVector<WebString> m_ideal;
 };
 
 class BLINK_PLATFORM_EXPORT BooleanConstraint : public BaseConstraint {
 public:
@@ skipping 54 matching lines @@
     BooleanConstraint googExperimentalAutoGainControl;
     BooleanConstraint googNoiseSuppression;
     BooleanConstraint googHighpassFilter;
     BooleanConstraint googTypingNoiseDetection;
     BooleanConstraint googExperimentalNoiseSuppression;
     BooleanConstraint googBeamforming;
     StringConstraint googArrayGeometry;
     BooleanConstraint googAudioMirroring;
     BooleanConstraint googDAEchoCancellation;
     BooleanConstraint googNoiseReduction;
-    StringConstraint offerToReceiveAudio;
-    StringConstraint offerToReceiveVideo;
+    LongConstraint offerToReceiveAudio;
+    LongConstraint offerToReceiveVideo;
     BooleanConstraint voiceActivityDetection;
     BooleanConstraint iceRestart;
     BooleanConstraint googUseRtpMux;
     BooleanConstraint enableDtlsSrtp;
     BooleanConstraint enableRtpDataChannels;
     BooleanConstraint enableDscp;
     BooleanConstraint enableIPv6;
     BooleanConstraint googEnableVideoSuspendBelowMinBitrate;
     LongConstraint googNumUnsignalledRecvStreams;
     BooleanConstraint googCombinedAudioVideoBwe;
     LongConstraint googScreencastMinBitrate;
     BooleanConstraint googCpuOveruseDetection;
     LongConstraint googCpuUnderuseThreshold;
     LongConstraint googCpuOveruseThreshold;
     LongConstraint googCpuUnderuseEncodeRsdThreshold;
     LongConstraint googCpuOveruseEncodeRsdThreshold;
     BooleanConstraint googCpuOveruseEncodeUsage;
     LongConstraint googHighStartBitrate;
     BooleanConstraint googPayloadPadding;
+    LongConstraint googLatencyMs;
+    LongConstraint googPowerLineFrequency;
 
     BLINK_PLATFORM_EXPORT bool isEmpty() const;
     BLINK_PLATFORM_EXPORT bool hasMandatory() const;
     BLINK_PLATFORM_EXPORT bool hasMandatoryOutsideSet(const std::vector<std::string>&, std::string&) const;
     BLINK_PLATFORM_EXPORT WebString toString() const;
 
 private:
     std::vector<const BaseConstraint*> allConstraints() const;
 };
 
-// Old type/value form of constraint. Will be deprecated.
-struct WebMediaConstraint {
-    WebMediaConstraint()
-    {
-    }
-
-    WebMediaConstraint(WebString name, WebString value)
-        : m_name(name)
-        , m_value(value)
-    {
-    }
-
-    WebString m_name;
-    WebString m_value;
-};
-
 class WebMediaConstraints {
 public:
     WebMediaConstraints()
     {
     }
     WebMediaConstraints(const WebMediaConstraints& other) { assign(other); }
     ~WebMediaConstraints() { reset(); }
 
     WebMediaConstraints& operator=(const WebMediaConstraints& other)
     {
         assign(other);
         return *this;
     }
 
     BLINK_PLATFORM_EXPORT void assign(const WebMediaConstraints&);
 
     BLINK_PLATFORM_EXPORT void reset();
     bool isNull() const { return m_private.isNull(); }
-
     BLINK_PLATFORM_EXPORT bool isEmpty() const;
-    // Old accessors, will be deprecated
-    BLINK_PLATFORM_EXPORT void getOptionalConstraints(WebVector<WebMediaConstraint>&) const;
-    BLINK_PLATFORM_EXPORT void getMandatoryConstraints(WebVector<WebMediaConstraint>&) const;
-
-    BLINK_PLATFORM_EXPORT bool getOptionalConstraintValue(const WebString& name, WebString& value) const;
-    BLINK_PLATFORM_EXPORT bool getMandatoryConstraintValue(const WebString& name, WebString& value) const;
-    // End of will be deprecated
 
     BLINK_PLATFORM_EXPORT void initialize();
-    // Transition initializer, will be removed
-    BLINK_PLATFORM_EXPORT void initialize(const WebVector<WebMediaConstraint>& optional, const WebVector<WebMediaConstraint>& mandatory, const WebMediaTrackConstraintSet& basic, const WebVector<WebMediaTrackConstraintSet>& advanced);
-
     BLINK_PLATFORM_EXPORT void initialize(const WebMediaTrackConstraintSet& basic, const WebVector<WebMediaTrackConstraintSet>& advanced);
 
     BLINK_PLATFORM_EXPORT const WebMediaTrackConstraintSet& basic() const;
     BLINK_PLATFORM_EXPORT const WebVector<WebMediaTrackConstraintSet>& advanced() const;
 
     BLINK_PLATFORM_EXPORT const WebString toString() const;
 
 private:
     WebPrivatePtr<WebMediaConstraintsPrivate> m_private;
 };
 
 } // namespace blink
 
 #endif // WebMediaConstraints_h