WebRtcBrowserTest with VP8 and VP9. WebRtcTestBase::NegotiateCall specifying video codec.

chrome/browser/media/webrtc_browsertest_base.cc

Index: chrome/browser/media/webrtc_browsertest_base.cc
diff --git a/chrome/browser/media/webrtc_browsertest_base.cc b/chrome/browser/media/webrtc_browsertest_base.cc
index 01788c7d229840e347fe18e3f8b5e0cf06352ccd..c845e3062f5269afaf0dbd5936f248df5226f228 100644
--- a/chrome/browser/media/webrtc_browsertest_base.cc
+++ b/chrome/browser/media/webrtc_browsertest_base.cc
@@ -315,8 +315,15 @@ void WebRtcTestBase::SetupPeerconnectionWithoutLocalStream(
 }
 
 std::string WebRtcTestBase::CreateLocalOffer(
-      content::WebContents* from_tab) const {
-  std::string response = ExecuteJavascript("createLocalOffer({})", from_tab);
+      content::WebContents* from_tab,
+      std::string default_video_codec) const {
+  if (default_video_codec != "")

[phoglund_chromium, 2016/02/01 14:20:44]

nit:
if (default_video_codec.empty())
  default_video_codec = "null";
else
  default_video_codec = ...;

[hbos_chromium, 2016/02/02 14:07:19]

Done.

+    default_video_codec = "'" + default_video_codec + "'";
+  else
+    default_video_codec = "null";
+  std::string javascript = base::StringPrintf(
+      "createLocalOffer({}, %s)", default_video_codec.c_str());
+  std::string response = ExecuteJavascript(javascript, from_tab);
   EXPECT_EQ("ok-", response.substr(0, 3)) << "Failed to create local offer: "
       << response;
 
@@ -324,10 +331,18 @@ std::string WebRtcTestBase::CreateLocalOffer(
   return local_offer;
 }
 
-std::string WebRtcTestBase::CreateAnswer(std::string local_offer,
-                                         content::WebContents* to_tab) const {
+std::string WebRtcTestBase::CreateAnswer(
+    std::string local_offer,
+    content::WebContents* to_tab,
+    std::string default_video_codec) const {
+  if (default_video_codec != "")

[phoglund_chromium, 2016/02/01 14:20:44]

Nit: same here

[hbos_chromium, 2016/02/02 14:07:19]

Done.

+    default_video_codec = "'" + default_video_codec + "'";
+  else
+    default_video_codec = "null";
   std::string javascript =
-      base::StringPrintf("receiveOfferFromPeer('%s', {})", local_offer.c_str());
+      base::StringPrintf("receiveOfferFromPeer('%s', {}, %s)",
+                         local_offer.c_str(),
+                         default_video_codec.c_str());
   std::string response = ExecuteJavascript(javascript, to_tab);
   EXPECT_EQ("ok-", response.substr(0, 3))
       << "Receiving peer failed to receive offer and create answer: "
@@ -358,9 +373,10 @@ void WebRtcTestBase::GatherAndSendIceCandidates(
 }
 
 void WebRtcTestBase::NegotiateCall(content::WebContents* from_tab,
-                                   content::WebContents* to_tab) const {
-  std::string local_offer = CreateLocalOffer(from_tab);
-  std::string answer = CreateAnswer(local_offer, to_tab);
+                                   content::WebContents* to_tab,
+                                   const std::string& video_codec) const {
+  std::string local_offer = CreateLocalOffer(from_tab, video_codec);
+  std::string answer = CreateAnswer(local_offer, to_tab, video_codec);
   ReceiveAnswer(answer, from_tab);
 
   // Send all ICE candidates (wait for gathering to finish if necessary).