All WebRTC content browsertests will now force iSAC 16K on Android.

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/debug/trace_event_impl.h"
 #include "base/json/json_reader.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.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"
 #include "content/public/test/browser_test_utils.h"
 #include "content/shell/browser/shell.h"
 #include "content/test/content_browser_test.h"
 #include "content/test/content_browser_test_utils.h"
 #include "media/audio/audio_manager.h"
 #include "net/test/embedded_test_server/embedded_test_server.h"
 #include "testing/perf/perf_test.h"
 
 #if defined(OS_WIN)
 #include "base/win/windows_version.h"
 #endif
 
-const char kForceIsac16K[] =
-#ifdef OS_ANDROID
-  // The default audio codec, Opus, doesn't work on Android.
-  "true";
-#else
-  "false";
-#endif
-
 namespace {
 
 static const char kGetUserMediaAndStop[] = "getUserMediaAndStop";
 static const char kGetUserMediaAndWaitAndStop[] = "getUserMediaAndWaitAndStop";
 static const char kGetUserMediaAndAnalyseAndStop[] =
     "getUserMediaAndAnalyseAndStop";
 
 // Results returned by JS.
 static const char kOK[] = "OK";
 static const char kGetUserMediaFailed[] =
@@ skipping 73 matching lines @@
 
     int error_code;
     std::string error_message;
     scoped_ptr<base::Value> value(
         base::JSONReader::ReadAndReturnError(contents,
                                              base::JSON_ALLOW_TRAILING_COMMAS,
                                              &error_code,
                                              &error_message));
 
     ASSERT_TRUE(value.get() != NULL) << error_message;
-    EXPECT_EQ(value->GetType(), base::Value::TYPE_LIST);
+    ASSERT_EQ(value->GetType(), base::Value::TYPE_LIST);
 
     base::ListValue* values;
     ASSERT_TRUE(value->GetAsList(&values));
 
     int duration_ns = 0;
     std::string samples_duration;
     double timestamp_ns = 0.0;
     double previous_timestamp_ns = 0.0;
     std::string samples_interarrival_ns;
     for (base::ListValue::iterator it = values->begin();
@@ skipping 83 matching lines @@
                                               javascript,
                                               &result));
     return result;
   }
 
   void ExpectTitle(const std::string& expected_title) const {
     base::string16 expected_title16(base::ASCIIToUTF16(expected_title));
     TitleWatcher title_watcher(shell()->web_contents(), expected_title16);
     EXPECT_EQ(expected_title16, title_watcher.WaitAndGetTitle());
   }
+
+  // Convenience function since most peerconnection-call.html tests just load
+  // the page, kick off some javascript and wait for the title to change to OK.
+  void MakeTypicalPeerConnectionCall(const std::string& javascript) {
+    ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady());
+
+    GURL url(embedded_test_server()->GetURL("/media/peerconnection-call.html"));
+    NavigateToURL(shell(), url);
+
+#if defined (OS_ANDROID)
+    // Always force iSAC 16K on Android for now (Opus is broken).
+    ASSERT_TRUE(ExecuteJavascript("forceIsac16KInSdp();"));
+#endif
+
+    ASSERT_TRUE(ExecuteJavascript(javascript));
+    ExpectTitle("OK");
+  }
 };
 
 // These tests will all make a getUserMedia call with different constraints and
 // see that the success callback is called. If the error callback is called or
 // none of the callbacks are called the tests will simply time out and fail.
 IN_PROC_BROWSER_TEST_F(WebrtcBrowserTest, GetVideoStreamAndStop) {
   ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady());
 
   GURL url(embedded_test_server()->GetURL("/media/getusermedia.html"));
   NavigateToURL(shell(), url);
 
-  EXPECT_TRUE(ExecuteJavascript(
+  ASSERT_TRUE(ExecuteJavascript(
       base::StringPrintf("%s({video: true});", kGetUserMediaAndStop)));
 
   ExpectTitle("OK");
 }
 
 IN_PROC_BROWSER_TEST_F(WebrtcBrowserTest, GetAudioAndVideoStreamAndStop) {
   ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady());
 
   GURL url(embedded_test_server()->GetURL("/media/getusermedia.html"));
   NavigateToURL(shell(), url);
 
-  EXPECT_TRUE(ExecuteJavascript(base::StringPrintf(
+  ASSERT_TRUE(ExecuteJavascript(base::StringPrintf(
       "%s({video: true, audio: true});", kGetUserMediaAndStop)));
 
   ExpectTitle("OK");
 }
 
 IN_PROC_BROWSER_TEST_F(WebrtcBrowserTest, GetAudioAndVideoStreamAndClone) {
   ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady());
 
   GURL url(embedded_test_server()->GetURL("/media/getusermedia.html"));
   NavigateToURL(shell(), url);
 
-  EXPECT_TRUE(ExecuteJavascript("getUserMediaAndClone();"));
+  ASSERT_TRUE(ExecuteJavascript("getUserMediaAndClone();"));
 
   ExpectTitle("OK");
 }
 
 IN_PROC_BROWSER_TEST_F(WebrtcBrowserTest, GetUserMediaWithMandatorySourceID) {
   ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady());
 
   std::vector<std::string> audio_ids;
   std::vector<std::string> video_ids;
   GetSources(&audio_ids, &video_ids);
@@ skipping 108 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_F(WebrtcBrowserTest, MAYBE_CanSetupVideoCall) {
-  ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady());
-
-  GURL url(embedded_test_server()->GetURL("/media/peerconnection-call.html"));
-  NavigateToURL(shell(), url);
-
-  EXPECT_TRUE(ExecuteJavascript("call({video: true});"));
-  ExpectTitle("OK");
+  MakeTypicalPeerConnectionCall("call({video: true});");
 }
 
 // This test will make a simple getUserMedia page, verify that video is playing
 // in a simple local <video>, and for a couple of seconds, collect some
 // performance traces.
 IN_PROC_BROWSER_TEST_F(WebrtcBrowserTest, TracePerformanceDuringGetUserMedia) {
   ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady());
 
   GURL url(embedded_test_server()->GetURL("/media/getusermedia.html"));
   NavigateToURL(shell(), url);
   // Put getUserMedia to work and let it run for a couple of seconds.
-  EXPECT_TRUE(ExecuteJavascript(base::StringPrintf(
+  ASSERT_TRUE(ExecuteJavascript(base::StringPrintf(
       "%s({video: true}, 10);", kGetUserMediaAndWaitAndStop)));
 
   // Make sure the stream is up and running, then start collecting traces.
   ExpectTitle("Running...");
   base::debug::TraceLog* trace_log = base::debug::TraceLog::GetInstance();
   trace_log->SetEnabled(base::debug::CategoryFilter("video"),
                         base::debug::TraceLog::ENABLE_SAMPLING);
   // Check that we are indeed recording.
-  EXPECT_EQ(trace_log->GetNumTracesRecorded(), 1);
+  ASSERT_EQ(trace_log->GetNumTracesRecorded(), 1);
 
   // Wait until the page title changes to "OK". Do not sleep() here since that
   // would stop both this code and the browser underneath.
   ExpectTitle("OK");
 
   // Note that we need to stop the trace recording before flushing the data.
   trace_log->SetDisabled();
   trace_log->Flush(base::Bind(&WebrtcBrowserTest::DumpChromeTraceCallback,
                               base::Unretained(this)));
 }
 
 #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_F(WebrtcBrowserTest, MAYBE_CanSetupAudioAndVideoCall) {
-  ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady());
-
-  GURL url(embedded_test_server()->GetURL("/media/peerconnection-call.html"));
-  NavigateToURL(shell(), url);
-
-  EXPECT_TRUE(ExecuteJavascript("call({video: true, audio: true});"));
-  ExpectTitle("OK");
+  MakeTypicalPeerConnectionCall("call({video: true, audio: true});");
 }
 
 IN_PROC_BROWSER_TEST_F(WebrtcBrowserTest, MANUAL_CanSetupCallAndSendDtmf) {
-  ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady());
-
-  GURL url(embedded_test_server()->GetURL("/media/peerconnection-call.html"));
-  NavigateToURL(shell(), url);
-
-  EXPECT_TRUE(
-      ExecuteJavascript("callAndSendDtmf('123,abc');"));
+  MakeTypicalPeerConnectionCall("callAndSendDtmf('123,abc');");
 }
 
 IN_PROC_BROWSER_TEST_F(WebrtcBrowserTest,
                        DISABLED_CanMakeEmptyCallThenAddStreamsAndRenegotiate) {
-  ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady());
-
-  GURL url(embedded_test_server()->GetURL("/media/peerconnection-call.html"));
-  NavigateToURL(shell(), url);
-
   const char* kJavascript =
       "callEmptyThenAddOneStreamAndRenegotiate({video: true, audio: true});";
-  EXPECT_TRUE(ExecuteJavascript(kJavascript));
-  ExpectTitle("OK");
+  MakeTypicalPeerConnectionCall(kJavascript);
 }
 
 // Below 2 test will make a complete PeerConnection-based call between pc1 and
 // pc2, and then use the remote stream to setup a call between pc3 and pc4, and
 // then verify that video is received on pc3 and pc4.
 // Flaky on win xp. http://crbug.com/304775
 #if defined(OS_WIN)
 #define MAYBE_CanForwardRemoteStream DISABLED_CanForwardRemoteStream
 #define MAYBE_CanForwardRemoteStream720p DISABLED_CanForwardRemoteStream720p
 #else
 #define MAYBE_CanForwardRemoteStream CanForwardRemoteStream
 #define MAYBE_CanForwardRemoteStream720p CanForwardRemoteStream720p
 #endif
 IN_PROC_BROWSER_TEST_F(WebrtcBrowserTest, MAYBE_CanForwardRemoteStream) {
-  ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady());
-
-  GURL url(embedded_test_server()->GetURL("/media/peerconnection-call.html"));
-  NavigateToURL(shell(), url);
-
-  EXPECT_TRUE(ExecuteJavascript(
-                  "callAndForwardRemoteStream({video: true, audio: true});"));
-  ExpectTitle("OK");
+  MakeTypicalPeerConnectionCall(
+      "callAndForwardRemoteStream({video: true, audio: true});");
 }
 
 IN_PROC_BROWSER_TEST_F(WebrtcBrowserTest, MAYBE_CanForwardRemoteStream720p) {
-  ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady());
-
-  GURL url(embedded_test_server()->GetURL("/media/peerconnection-call.html"));
-  NavigateToURL(shell(), url);
-
-  const std::string cmd = GenerateGetUserMediaCall("callAndForwardRemoteStream",
-                                                   1280, 1280,
-                                                   720, 720, 30, 30);
-  EXPECT_TRUE(ExecuteJavascript(cmd));
-  ExpectTitle("OK");
+  const std::string javascript = GenerateGetUserMediaCall(
+      "callAndForwardRemoteStream", 1280, 1280, 720, 720, 30, 30);
+  MakeTypicalPeerConnectionCall(javascript);
 }
 
 // This test will make a complete PeerConnection-based call but remove the
 // MSID and bundle attribute from the initial offer to verify that
 // video is playing for the call even if the initiating client don't support
 // MSID. http://tools.ietf.org/html/draft-alvestrand-rtcweb-msid-02
 #if defined(OS_WIN) && defined(USE_AURA)
 // Disabled for win7_aura, see http://crbug.com/235089.
 #define MAYBE_CanSetupAudioAndVideoCallWithoutMsidAndBundle\
         DISABLED_CanSetupAudioAndVideoCallWithoutMsidAndBundle
 #elif defined(OS_LINUX) && !defined(OS_CHROMEOS) && defined(ARCH_CPU_ARM_FAMILY)
 // Timing out on ARM linux, see http://crbug.com/240373
 #define MAYBE_CanSetupAudioAndVideoCallWithoutMsidAndBundle\
         DISABLED_CanSetupAudioAndVideoCallWithoutMsidAndBundle
 #else
 #define MAYBE_CanSetupAudioAndVideoCallWithoutMsidAndBundle\
         CanSetupAudioAndVideoCallWithoutMsidAndBundle
 #endif
 IN_PROC_BROWSER_TEST_F(WebrtcBrowserTest,
                        MAYBE_CanSetupAudioAndVideoCallWithoutMsidAndBundle) {
-  ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady());
-
-  GURL url(embedded_test_server()->GetURL("/media/peerconnection-call.html"));
-  NavigateToURL(shell(), url);
-
-  EXPECT_TRUE(ExecuteJavascript("callWithoutMsidAndBundle();"));
-  ExpectTitle("OK");
+  MakeTypicalPeerConnectionCall("callWithoutMsidAndBundle();");
 }
 
 // This test will modify the SDP offer to an unsupported codec, which should
 // cause SetLocalDescription to fail.
-IN_PROC_BROWSER_TEST_F(WebrtcBrowserTest,
-                       NegotiateUnsupportedVideoCodec) {
-  ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady());
-
-  GURL url(embedded_test_server()->GetURL("/media/peerconnection-call.html"));
-  NavigateToURL(shell(), url);
-
-  EXPECT_TRUE(ExecuteJavascript("negotiateUnsupportedVideoCodec();"));
-  ExpectTitle("OK");
+IN_PROC_BROWSER_TEST_F(WebrtcBrowserTest, NegotiateUnsupportedVideoCodec) {
+  MakeTypicalPeerConnectionCall("negotiateUnsupportedVideoCodec();");
 }
 
 // This test will modify the SDP offer to use no encryption, which should
 // cause SetLocalDescription to fail.
 IN_PROC_BROWSER_TEST_F(WebrtcBrowserTest, NegotiateNonCryptoCall) {
-  ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady());
-
-  GURL url(embedded_test_server()->GetURL("/media/peerconnection-call.html"));
-  NavigateToURL(shell(), url);
-
-  EXPECT_TRUE(ExecuteJavascript("negotiateNonCryptoCall();"));
-  ExpectTitle("OK");
+  MakeTypicalPeerConnectionCall("negotiateNonCryptoCall();");
 }
 
 // This test will make a complete PeerConnection-based call using legacy SDP
 // settings: GIce, external SDES, and no BUNDLE.
 #if defined(OS_WIN) && defined(USE_AURA)
 // Disabled for win7_aura, see http://crbug.com/235089.
 #define MAYBE_CanSetupLegacyCall DISABLED_CanSetupLegacyCall
 #elif defined(OS_LINUX) && !defined(OS_CHROMEOS) && defined(ARCH_CPU_ARM_FAMILY)
 // Timing out on ARM linux, see http://crbug.com/240373
 #define MAYBE_CanSetupLegacyCall DISABLED_CanSetupLegacyCall
 #else
 #define MAYBE_CanSetupLegacyCall CanSetupLegacyCall
 #endif
 
 IN_PROC_BROWSER_TEST_F(WebrtcBrowserTest, MAYBE_CanSetupLegacyCall) {
-  ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady());
-
-  GURL url(embedded_test_server()->GetURL("/media/peerconnection-call.html"));
-  NavigateToURL(shell(), url);
-
-  EXPECT_TRUE(ExecuteJavascript("callWithLegacySdp();"));
-  ExpectTitle("OK");
+  MakeTypicalPeerConnectionCall("callWithLegacySdp();");
 }
 
 // This test will make a PeerConnection-based call and test an unreliable text
 // dataChannel.
 // TODO(mallinath) - Remove this test after rtp based data channel is disabled.
 IN_PROC_BROWSER_TEST_F(WebrtcBrowserTest, CallWithDataOnly) {
-  ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady());
-
-  GURL url(embedded_test_server()->GetURL("/media/peerconnection-call.html"));
-  NavigateToURL(shell(), url);
-
-  EXPECT_TRUE(ExecuteJavascript("callWithDataOnly();"));
-  ExpectTitle("OK");
+  MakeTypicalPeerConnectionCall("callWithDataOnly();");
 }
 
 IN_PROC_BROWSER_TEST_F(WebrtcBrowserTest, CallWithSctpDataOnly) {
-  ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady());
-
-  GURL url(embedded_test_server()->GetURL("/media/peerconnection-call.html"));
-  NavigateToURL(shell(), url);
-
-  EXPECT_TRUE(ExecuteJavascript("callWithSctpDataOnly();"));
-  ExpectTitle("OK");
+  MakeTypicalPeerConnectionCall("callWithSctpDataOnly();");
 }
 
 #if defined(OS_LINUX) && !defined(OS_CHROMEOS) && defined(ARCH_CPU_ARM_FAMILY)
 // Timing out on ARM linux bot: http://crbug.com/238490
 #define MAYBE_CallWithDataAndMedia DISABLED_CallWithDataAndMedia
 #else
 #define MAYBE_CallWithDataAndMedia CallWithDataAndMedia
 #endif
 
 // This test will make a PeerConnection-based call and test an unreliable text
 // dataChannel and audio and video tracks.
 // TODO(mallinath) - Remove this test after rtp based data channel is disabled.
 IN_PROC_BROWSER_TEST_F(WebrtcBrowserTest, MAYBE_CallWithDataAndMedia) {
-  ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady());
-
-  GURL url(embedded_test_server()->GetURL("/media/peerconnection-call.html"));
-  NavigateToURL(shell(), url);
-
-  EXPECT_TRUE(ExecuteJavascript("callWithDataAndMedia();"));
-  ExpectTitle("OK");
+  MakeTypicalPeerConnectionCall("callWithDataAndMedia();");
 }
 
 
 #if defined(OS_LINUX) && !defined(OS_CHROMEOS) && defined(ARCH_CPU_ARM_FAMILY)
 // Timing out on ARM linux bot: http://crbug.com/238490
 #define MAYBE_CallWithSctpDataAndMedia DISABLED_CallWithSctpDataAndMedia
 #else
 #define MAYBE_CallWithSctpDataAndMedia CallWithSctpDataAndMedia
 #endif
 
 IN_PROC_BROWSER_TEST_F(WebrtcBrowserTest,
                        MAYBE_CallWithSctpDataAndMedia) {
-  ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady());
-
-  GURL url(embedded_test_server()->GetURL("/media/peerconnection-call.html"));
-  NavigateToURL(shell(), url);
-
-  EXPECT_TRUE(ExecuteJavascript("callWithSctpDataAndMedia();"));
-  ExpectTitle("OK");
+  MakeTypicalPeerConnectionCall("callWithSctpDataAndMedia();");
 }
 
 #if defined(OS_LINUX) && !defined(OS_CHROMEOS) && defined(ARCH_CPU_ARM_FAMILY)
 // Timing out on ARM linux bot: http://crbug.com/238490
 #define MAYBE_CallWithDataAndLaterAddMedia DISABLED_CallWithDataAndLaterAddMedia
 #else
 // Temporarily disable the test on all platforms. http://crbug.com/293252
 #define MAYBE_CallWithDataAndLaterAddMedia DISABLED_CallWithDataAndLaterAddMedia
 #endif
 
 // This test will make a PeerConnection-based call and test an unreliable text
 // dataChannel and later add an audio and video track.
 IN_PROC_BROWSER_TEST_F(WebrtcBrowserTest, MAYBE_CallWithDataAndLaterAddMedia) {
-  ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady());
-
-  GURL url(embedded_test_server()->GetURL("/media/peerconnection-call.html"));
-  NavigateToURL(shell(), url);
-
-  EXPECT_TRUE(ExecuteJavascript("callWithDataAndLaterAddMedia();"));
-  ExpectTitle("OK");
+  MakeTypicalPeerConnectionCall("callWithDataAndLaterAddMedia();");
 }
 
 #if defined(OS_LINUX) && !defined(OS_CHROMEOS) && defined(ARCH_CPU_ARM_FAMILY)
 // Timing out on ARM linux bot: http://crbug.com/238490
 #define MAYBE_CallWithNewVideoMediaStream DISABLED_CallWithNewVideoMediaStream
 #else
 #define MAYBE_CallWithNewVideoMediaStream CallWithNewVideoMediaStream
 #endif
 
 // This test will make a PeerConnection-based call and send a new Video
 // MediaStream that has been created based on a MediaStream created with
 // getUserMedia.
 IN_PROC_BROWSER_TEST_F(WebrtcBrowserTest, MAYBE_CallWithNewVideoMediaStream) {
-  ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady());
-
-  GURL url(embedded_test_server()->GetURL("/media/peerconnection-call.html"));
-  NavigateToURL(shell(), url);
-
-  EXPECT_TRUE(ExecuteJavascript("callWithNewVideoMediaStream();"));
-  ExpectTitle("OK");
+  MakeTypicalPeerConnectionCall("callWithNewVideoMediaStream();");
 }
 
 // This test will make a PeerConnection-based call and send a new Video
 // MediaStream that has been created based on a MediaStream created with
 // getUserMedia. When video is flowing, the VideoTrack is removed and an
 // AudioTrack is added instead.
 // TODO(phoglund): This test is manual since not all buildbots has an audio
 // input.
 IN_PROC_BROWSER_TEST_F(WebrtcBrowserTest, MANUAL_CallAndModifyStream) {
-  ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady());
-
-  GURL url(embedded_test_server()->GetURL("/media/peerconnection-call.html"));
-  NavigateToURL(shell(), url);
-
-  EXPECT_TRUE(
-      ExecuteJavascript("callWithNewVideoMediaStreamLaterSwitchToAudio();"));
-  ExpectTitle("OK");
+  MakeTypicalPeerConnectionCall(
+      "callWithNewVideoMediaStreamLaterSwitchToAudio();");
 }
 
 // This test calls getUserMedia in sequence with different constraints.
 IN_PROC_BROWSER_TEST_F(WebrtcBrowserTest, TestGetUserMediaConstraints) {
   ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady());
 
   GURL url(embedded_test_server()->GetURL("/media/getusermedia.html"));
 
   std::vector<std::string> list_of_get_user_media_calls;
   list_of_get_user_media_calls.push_back(GenerateGetUserMediaCall(
@@ skipping 10 matching lines @@
       kGetUserMediaAndStop, 1280, 1280, 720, 720, 30, 30));
   list_of_get_user_media_calls.push_back(GenerateGetUserMediaCall(
       kGetUserMediaAndStop, 1920, 1920, 1080, 1080, 30, 30));
 
   for (std::vector<std::string>::iterator const_iterator =
            list_of_get_user_media_calls.begin();
        const_iterator != list_of_get_user_media_calls.end();
        ++const_iterator) {
     DVLOG(1) << "Calling getUserMedia: " << *const_iterator;
     NavigateToURL(shell(), url);
-    EXPECT_TRUE(ExecuteJavascript(*const_iterator));
+    ASSERT_TRUE(ExecuteJavascript(*const_iterator));
     ExpectTitle("OK");
   }
 }
 
 // This test calls getUserMedia and checks for aspect ratio behavior.
 IN_PROC_BROWSER_TEST_F(WebrtcBrowserTest, TestGetUserMediaAspectRatio) {
   ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady());
 
   GURL url(embedded_test_server()->GetURL("/media/getusermedia.html"));
 
   std::string constraints_4_3 = GenerateGetUserMediaCall(
       kGetUserMediaAndAnalyseAndStop, 640, 640, 480, 480, 30, 30);
   std::string constraints_16_9 = GenerateGetUserMediaCall(
       kGetUserMediaAndAnalyseAndStop, 640, 640, 360, 360, 30, 30);
 
   // TODO(mcasas): add more aspect ratios, in particular 16:10 crbug.com/275594.
 
   NavigateToURL(shell(), url);
-  EXPECT_TRUE(ExecuteJavascript(constraints_4_3));
+  ASSERT_TRUE(ExecuteJavascript(constraints_4_3));
   ExpectTitle("4:3 letterbox");
 
   NavigateToURL(shell(), url);
-  EXPECT_TRUE(ExecuteJavascript(constraints_16_9));
+  ASSERT_TRUE(ExecuteJavascript(constraints_16_9));
   ExpectTitle("16:9 letterbox");
 }
 
 IN_PROC_BROWSER_TEST_F(WebrtcBrowserTest, AddTwoMediaStreamsToOnePC) {
-  ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady());
-
-  GURL url(embedded_test_server()->GetURL("/media/peerconnection-call.html"));
-  NavigateToURL(shell(), url);
-
-  EXPECT_TRUE(
-      ExecuteJavascript("addTwoMediaStreamsToOneConnection();"));
-  ExpectTitle("OK");
+  MakeTypicalPeerConnectionCall("addTwoMediaStreamsToOneConnection();");
 }
 
 IN_PROC_BROWSER_TEST_F(WebrtcBrowserTest,
                        EstablishAudioVideoCallAndMeasureOutputLevel) {
   if (!media::AudioManager::Get()->HasAudioOutputDevices()) {
     // Bots with no output devices will force the audio code into a different
     // path where it doesn't manage to set either the low or high latency path.
     // This test will compute useless values in that case, so skip running on
     // such bots (see crbug.com/326338).
     LOG(INFO) << "Missing output devices: skipping test...";
     return;
   }
 
-  ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady());
   ASSERT_TRUE(CommandLine::ForCurrentProcess()->HasSwitch(
       switches::kUseFakeDeviceForMediaStream))
           << "Must run with fake devices since the test will explicitly look "
           << "for the fake device signal.";
 
-  GURL url(embedded_test_server()->GetURL("/media/peerconnection-call.html"));
-  NavigateToURL(shell(), url);
-
-  EXPECT_TRUE(ExecuteJavascript(
-      base::StringPrintf("callAndEnsureAudioIsPlaying(%s);", kForceIsac16K)));
-  ExpectTitle("OK");
+  MakeTypicalPeerConnectionCall("callAndEnsureAudioIsPlaying();");
 }
 
 IN_PROC_BROWSER_TEST_F(WebrtcBrowserTest,
                        EstablishAudioVideoCallAndVerifyMutingWorks) {
   if (!media::AudioManager::Get()->HasAudioOutputDevices()) {
     // Bots with no output devices will force the audio code into a different
     // path where it doesn't manage to set either the low or high latency path.
     // This test will compute useless values in that case, so skip running on
     // such bots (see crbug.com/326338).
     LOG(INFO) << "Missing output devices: skipping test...";
     return;
   }
 
-  ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady());
   ASSERT_TRUE(CommandLine::ForCurrentProcess()->HasSwitch(
       switches::kUseFakeDeviceForMediaStream))
           << "Must run with fake devices since the test will explicitly look "
           << "for the fake device signal.";
 
-  GURL url(embedded_test_server()->GetURL("/media/peerconnection-call.html"));
-  NavigateToURL(shell(), url);
-
-  EXPECT_TRUE(ExecuteJavascript(
-        base::StringPrintf("callAndEnsureAudioMutingWorks(%s);",
-                           kForceIsac16K)));
-  ExpectTitle("OK");
+  MakeTypicalPeerConnectionCall("callAndEnsureAudioMutingWorks();");
 }
 
 #if defined(OS_WIN) || (defined(OS_LINUX) && !defined(OS_CHROMEOS) && defined(ARCH_CPU_ARM_FAMILY))
 // Timing out on ARM linux bot: http://crbug.com/238490
 // Failing on Windows: http://crbug.com/331035
 #define MAYBE_CallWithAecDump DISABLED_CallWithAecDump
 #else
 #define MAYBE_CallWithAecDump CallWithAecDump
 #endif
 
@@ skipping 64 matching lines @@
   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