Add test for sending square resolution video on a PeerConnection.

content/browser/media/webrtc_browsertest.cc

Index: content/browser/media/webrtc_browsertest.cc
diff --git a/content/browser/media/webrtc_browsertest.cc b/content/browser/media/webrtc_browsertest.cc
index 62b50da4677552f70da4ba50ce89c6e85a7abed9..c1b1f658cb4934ff86c50355dc94e40d4168f48c 100644
--- a/content/browser/media/webrtc_browsertest.cc
+++ b/content/browser/media/webrtc_browsertest.cc
@@ -72,7 +72,14 @@ INSTANTIATE_TEST_CASE_P(WebRtcBrowserTests,
 // These tests will make a complete PeerConnection-based call and verify that
 // video is playing for the call.
 IN_PROC_BROWSER_TEST_P(WebRtcBrowserTest, MAYBE_CanSetupVideoCall) {
-  MakeTypicalPeerConnectionCall("call({video: true});");
+  MakeTypicalPeerConnectionCall("call({video: true}, 640, 480);");

[phoglund_chromium, 2014/03/28 08:33:30]

This is confusing - it looks like we're setting up a call to be 640x480, but we
are setting up a call according to the constraints and just verifying the
resolution is 640x480.

Also, this function is now effectively verifying that the default constraint
gives you 640x480, which should be clearer.

I can imagine ways to get this to read better. Unfortunately we can't use named
parameters like in python (call(c, expected_width=640, ...) would have been
nice), so what about this:

Keep the original call() and make a new function callAndVerifyResolution which
does what you want above.

I would also like to not duplicate the assumption that the default gives you
640x480. So keep CanSetupVideoCall and the other tests as they are and add a new
test method DefaultVideoConstraintsGivesVga which explicitly tests the above.

[perkj_chrome, 2014/03/28 09:14:23]

Done.

+}
+
+IN_PROC_BROWSER_TEST_P(WebRtcBrowserTest, CanSetupVideoCallWith1To1AspecRatio) {
+  const std::string javascript =
+      "call({video: {mandatory: {minWidth: 320, maxWidth: 320, minHeight: 320, "
+      "maxHeight: 320}}}, 320, 320);";
+  MakeTypicalPeerConnectionCall(javascript);
 }
 
 #if defined(OS_LINUX) && !defined(OS_CHROMEOS) && defined(ARCH_CPU_ARM_FAMILY)
@@ -83,7 +90,7 @@ IN_PROC_BROWSER_TEST_P(WebRtcBrowserTest, MAYBE_CanSetupVideoCall) {
 #endif
 
 IN_PROC_BROWSER_TEST_P(WebRtcBrowserTest, MAYBE_CanSetupAudioAndVideoCall) {
-  MakeTypicalPeerConnectionCall("call({video: true, audio: true});");
+  MakeTypicalPeerConnectionCall("call({video: true, audio: true}, 640, 480);");
 }
 
 IN_PROC_BROWSER_TEST_P(WebRtcBrowserTest, MANUAL_CanSetupCallAndSendDtmf) {
@@ -355,7 +362,7 @@ IN_PROC_BROWSER_TEST_P(WebRtcBrowserTest, MAYBE_CallWithAecDump) {
   GURL url(embedded_test_server()->GetURL("/media/peerconnection-call.html"));
   NavigateToURL(shell(), url);
   DisableOpusIfOnAndroid();
-  ExecuteJavascriptAndWaitForOk("call({video: true, audio: true});");
+  ExecuteJavascriptAndWaitForOk("call({video: true, audio: true}, 640, 480);");
 
   EXPECT_TRUE(base::PathExists(dump_file));
   int64 file_size = 0;
@@ -392,7 +399,7 @@ IN_PROC_BROWSER_TEST_P(WebRtcBrowserTest,
   GURL url(embedded_test_server()->GetURL("/media/peerconnection-call.html"));
   NavigateToURL(shell(), url);
   DisableOpusIfOnAndroid();
-  ExecuteJavascriptAndWaitForOk("call({video: true, audio: true});");
+  ExecuteJavascriptAndWaitForOk("call({video: true, audio: true}, 640, 480);");
 
   EXPECT_TRUE(base::PathExists(dump_file));
   int64 file_size = 0;