Adds multiple forms of MediaStreamTrack constraints

third_party/WebKit/Source/modules/mediastream/MediaConstraintsTest.cpp

Index: third_party/WebKit/Source/modules/mediastream/MediaConstraintsTest.cpp
diff --git a/third_party/WebKit/Source/modules/mediastream/MediaConstraintsTest.cpp b/third_party/WebKit/Source/modules/mediastream/MediaConstraintsTest.cpp
index adc955480005b7e7b117f000057c87d81fa87f34..6fa7a5d1532a08337522bc67e0ecc13ad7426840 100644
--- a/third_party/WebKit/Source/modules/mediastream/MediaConstraintsTest.cpp
+++ b/third_party/WebKit/Source/modules/mediastream/MediaConstraintsTest.cpp
@@ -2,8 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include "modules/mediastream/MediaConstraintsImpl.h"
+#include "modules/mediastream/MediaTrackConstraints.h"
 #include "public/platform/WebMediaConstraints.h"
 #include "testing/gtest/include/gtest/gtest.h"
+#include "wtf/Vector.h"

[tommi (sloooow) - chröme, 2016/05/24 13:54:38]

if we can avoid adding these includes and use the Vector and String types
already being used, that would be preferable.

[hta - Chromium, 2016/05/24 14:22:43]

These includes are what defines the Vector and String types. IWYU.
(and no, nothing in these tests used those types before.)

+#include "wtf/text/WTFString.h"
 
 // The MediaTrackConstraintsTest group tests the types declared in
 // WebKit/public/platform/WebMediaConstraints.h
@@ -114,3 +118,85 @@ TEST(MediaTrackConstraintsTest, ConstraintsToString)
     blink::WebMediaConstraints nullConstraints;
     EXPECT_EQ("", nullConstraints.toString().utf8());
 }
+
+TEST(MediaTrackConstraintsTest, ConvertWebConstraintsBasic)
+{
+    blink::WebMediaConstraints input;
+    blink::MediaTrackConstraints output;
+
+    blink::MediaConstraintsImpl::convertConstraints(input, output);
+}
+
+TEST(MediaTrackConstraintsTest, ConvertWebSingleStringConstraint)
+{
+    blink::WebMediaConstraints input;
+    blink::MediaTrackConstraints output;
+
+    blink::WebMediaTrackConstraintSet basic;
+    std::vector<blink::WebMediaTrackConstraintSet> advanced;
+
+    basic.facingMode.setIdeal(WTF::Vector<WTF::String>(1, WTF::String("foo")));

[tommi (sloooow) - chröme, 2016/05/24 13:54:38]

The function prototype expects a WebVector and WebString.  Looks like those are
the types that the other tests are using.  Can we use those instead? (or is
there some benefit to using different types?)

[hta - Chromium, 2016/05/24 14:22:43]

After discovering the "using" statements in the header files, I can take the WTF
prefixes off. As I discovered in the other source file, Blink seems happy to
auto-convert these for me.

+    input.initialize(basic, advanced);
+    blink::MediaConstraintsImpl::convertConstraints(input, output);
+    ASSERT_TRUE(output.hasFacingMode());
+    ASSERT_TRUE(output.facingMode().isString());
+    EXPECT_EQ("foo", output.facingMode().getAsString());
+}
+
+TEST(MediaTrackConstraintsTest, ConvertWebDoubleStringConstraint)
+{
+    blink::WebMediaConstraints input;
+    blink::MediaTrackConstraints output;
+
+    blink::WebMediaTrackConstraintSet basic;
+    std::vector<blink::WebMediaTrackConstraintSet> advanced;
+    WTF::Vector<WTF::String> buffer;
+    buffer.append(WTF::String("foo"));
+    buffer.append(WTF::String("bar"));
+
+    basic.facingMode.setIdeal(buffer);
+    input.initialize(basic, advanced);
+    blink::MediaConstraintsImpl::convertConstraints(input, output);
+    ASSERT_TRUE(output.hasFacingMode());
+    ASSERT_TRUE(output.facingMode().isStringSequence());
+    buffer = output.facingMode().getAsStringSequence();
+    EXPECT_EQ("foo", buffer[0]);
+    EXPECT_EQ("bar", buffer[1]);
+}
+
+TEST(MediaTrackConstraintsTest, ConvertBlinkStringConstraint)
+{
+    blink::MediaTrackConstraints input;
+    blink::WebMediaConstraints output;
+    blink::StringOrStringSequenceOrConstrainDOMStringParameters parameter;
+    parameter.setString("foo");
+    input.setFacingMode(parameter);
+    output = blink::MediaConstraintsImpl::convertConstraintsToWeb(input);
+    ASSERT_TRUE(output.basic().facingMode.hasIdeal());
+    ASSERT_EQ(1U, output.basic().facingMode.ideal().size());
+    ASSERT_EQ("foo", output.basic().facingMode.ideal()[0]);
+}
+
+TEST(MediaTrackConstraintsTest, ConvertBlinkComplexStringConstraint)
+{
+    blink::MediaTrackConstraints input;
+    blink::WebMediaConstraints output;
+    blink::StringOrStringSequenceOrConstrainDOMStringParameters parameter;
+    blink::ConstrainDOMStringParameters subparameter;
+    blink::StringOrStringSequence innerString;
+    innerString.setString("foo");
+    subparameter.setIdeal(innerString);
+    parameter.setConstrainDOMStringParameters(subparameter);
+    input.setFacingMode(parameter);
+    output = blink::MediaConstraintsImpl::convertConstraintsToWeb(input);
+    ASSERT_TRUE(output.basic().facingMode.hasIdeal());
+    ASSERT_EQ(1U, output.basic().facingMode.ideal().size());
+    ASSERT_EQ("foo", output.basic().facingMode.ideal()[0]);
+
+    // Convert this back, and see that it appears as a single string.
+    blink::MediaTrackConstraints recycled;
+    blink::MediaConstraintsImpl::convertConstraints(output, recycled);
+    ASSERT_TRUE(recycled.hasFacingMode());
+    ASSERT_TRUE(recycled.facingMode().isString());
+    ASSERT_EQ("foo", recycled.facingMode().getAsString());
+}