Add test for sending square resolution video on a PeerConnection.

content/browser/media/webrtc_browsertest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/command_line.h"
 #include "base/strings/stringprintf.h"
 #include "base/values.h"
 #include "content/browser/media/webrtc_internals.h"
 #include "content/browser/web_contents/web_contents_impl.h"
 #include "content/public/common/content_switches.h"
@@ skipping 54 matching lines @@
 #if defined(OS_LINUX) && !defined(OS_CHROMEOS) && defined(ARCH_CPU_ARM_FAMILY)
 // Timing out on ARM linux bot: http://crbug.com/238490
 #define MAYBE_CanSetupVideoCall DISABLED_CanSetupVideoCall
 #else
 #define MAYBE_CanSetupVideoCall CanSetupVideoCall
 #endif
 
 // 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)
 // Timing out on ARM linux, see http://crbug.com/240376
 #define MAYBE_CanSetupAudioAndVideoCall DISABLED_CanSetupAudioAndVideoCall
 #else
 #define MAYBE_CanSetupAudioAndVideoCall CanSetupAudioAndVideoCall
 #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) {
   MakeTypicalPeerConnectionCall("callAndSendDtmf(\'123,abc\');");
 }
 
 // TODO(phoglund): this test fails because the peer connection state will be
 // stable in the second negotiation round rather than have-local-offer.
 // http://crbug.com/293125.
 IN_PROC_BROWSER_TEST_P(WebRtcBrowserTest,
@@ skipping 251 matching lines @@
   base::FilePath dump_file;
   ASSERT_TRUE(CreateTemporaryFile(&dump_file));
 
   // This fakes the behavior of another open tab with webrtc-internals, and
   // enabling AEC dump in that tab.
   WebRTCInternals::GetInstance()->FileSelected(dump_file, -1, NULL);
 
   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;
   EXPECT_TRUE(base::GetFileSize(dump_file, &file_size));
   EXPECT_GT(file_size, 0);
 
   base::DeleteFile(dump_file, false);
 }
 
 #if defined(OS_LINUX) && !defined(OS_CHROMEOS) && defined(ARCH_CPU_ARM_FAMILY)
@@ skipping 16 matching lines @@
   ASSERT_TRUE(CreateTemporaryFile(&dump_file));
 
   // This fakes the behavior of another open tab with webrtc-internals, and
   // enabling AEC dump in that tab, then disabling it.
   WebRTCInternals::GetInstance()->FileSelected(dump_file, -1, NULL);
   WebRTCInternals::GetInstance()->DisableAecDump();
 
   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;
   EXPECT_TRUE(base::GetFileSize(dump_file, &file_size));
   EXPECT_EQ(0, file_size);
 
   base::DeleteFile(dump_file, false);
 }
 
 }  // namespace content