Refactored how WebRTC content browser tests talk to their javascript.

content/browser/media/webrtc_getusermedia_browsertest.cc

 // Copyright 2014 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/debug/trace_event_impl.h"
 #include "base/json/json_reader.h"
 #include "base/strings/stringprintf.h"
 #include "base/test/trace_event_analyzer.h"
 #include "base/values.h"
 #include "content/browser/media/webrtc_internals.h"
@@ skipping 10 matching lines @@
 #include "base/win/windows_version.h"
 #endif
 
 using trace_analyzer::TraceAnalyzer;
 using trace_analyzer::Query;
 using trace_analyzer::TraceEventVector;
 
 namespace {
 
 static const char kGetUserMediaAndStop[] = "getUserMediaAndStop";
-static const char kGetUserMediaAndWaitAndStop[] = "getUserMediaAndWaitAndStop";
+static const char kGetUserMediaAndGetStreamUp[] = "getUserMediaAndGetStreamUp";
 static const char kGetUserMediaAndAnalyseAndStop[] =
     "getUserMediaAndAnalyseAndStop";
+static const char kGetUserMediaAndExpectFailure[] =
+    "getUserMediaAndExpectFailure";
 
 // Results returned by JS.
 static const char kOK[] = "OK";
-static const char kGetUserMediaFailed[] =
-    "GetUserMedia call failed with code undefined";
 
 std::string GenerateGetUserMediaWithMandatorySourceID(
     const std::string& function_name,
     const std::string& audio_source_id,
     const std::string& video_source_id) {
   const std::string audio_constraint =
       "audio: {mandatory: { sourceId:\"" + audio_source_id + "\"}}, ";
 
   const std::string video_constraint =
       "video: {mandatory: { sourceId:\"" + video_source_id + "\"}}";
@@ skipping 53 matching lines @@
     return TraceAnalyzer::Create("[" + recorded_trace_data_->data() + "]");
   }
 
   void RunGetUserMediaAndCollectMeasures(const int time_to_sample_secs,
                                          const std::string& measure_filter,
                                          const std::string& graph_name) {
     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.
     DCHECK(time_to_sample_secs);
-    ASSERT_TRUE(
-        ExecuteJavascript(base::StringPrintf("%s({video: true}, %d);",
-                                             kGetUserMediaAndWaitAndStop,
-                                             time_to_sample_secs)));
+    ASSERT_EQ("ok-stream-running",
+        ExecuteJavascriptAndReturnResult(
+            base::StringPrintf("%s({video: true});",
+                               kGetUserMediaAndGetStreamUp)));
 
-    // Make sure the stream is up and running, then start collecting traces.
-    ExpectTitle("Running...");
+    // Now the stream is up and running, start collecting traces.
     StartTracing();
 
+    // Let the stream run for while in javascript.

[perkj_chrome, 2014/03/07 14:00:21]

for a w

[phoglund_chromium, 2014/03/07 14:23:36]

Done.

+    ExecuteJavascriptAndWaitForOk(
+        base::StringPrintf("waitAndStopVideoTrack(%d);", time_to_sample_secs));
+
     // 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");
     StopTracing();
 
     scoped_ptr<TraceAnalyzer> analyzer(CreateTraceAnalyzer());
     analyzer->AssociateBeginEndEvents();
     trace_analyzer::TraceEventVector events;
     DCHECK(measure_filter.size());
     analyzer->FindEvents(
         Query::EventNameIs(measure_filter),
         &events);
     ASSERT_GT(events.size(), 0u)
@@ skipping 71 matching lines @@
 
 // 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(WebRtcGetUserMediaBrowserTest, GetVideoStreamAndStop) {
   ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady());
 
   GURL url(embedded_test_server()->GetURL("/media/getusermedia.html"));
   NavigateToURL(shell(), url);
 
-  ASSERT_TRUE(ExecuteJavascript(
-      base::StringPrintf("%s({video: true});", kGetUserMediaAndStop)));
-
-  ExpectTitle("OK");
+  ExecuteJavascriptAndWaitForOk(
+      base::StringPrintf("%s({video: true});", kGetUserMediaAndStop));
 }
 
 IN_PROC_BROWSER_TEST_F(WebRtcGetUserMediaBrowserTest,
                        GetAudioAndVideoStreamAndStop) {
   ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady());
 
   GURL url(embedded_test_server()->GetURL("/media/getusermedia.html"));
   NavigateToURL(shell(), url);
 
-  ASSERT_TRUE(ExecuteJavascript(base::StringPrintf(
-      "%s({video: true, audio: true});", kGetUserMediaAndStop)));
-
-  ExpectTitle("OK");
+  ExecuteJavascriptAndWaitForOk(base::StringPrintf(
+      "%s({video: true, audio: true});", kGetUserMediaAndStop));
 }
 
 IN_PROC_BROWSER_TEST_F(WebRtcGetUserMediaBrowserTest,
                        GetAudioAndVideoStreamAndClone) {
   ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady());
 
   GURL url(embedded_test_server()->GetURL("/media/getusermedia.html"));
   NavigateToURL(shell(), url);
 
-  ASSERT_TRUE(ExecuteJavascript("getUserMediaAndClone();"));
-
-  ExpectTitle("OK");
+  ExecuteJavascriptAndWaitForOk("getUserMediaAndClone();");
 }
 
 IN_PROC_BROWSER_TEST_F(WebRtcGetUserMediaBrowserTest,
                        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 19 matching lines @@
   ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady());
 
   std::vector<std::string> audio_ids;
   std::vector<std::string> video_ids;
   GetSources(&audio_ids, &video_ids);
 
   GURL url(embedded_test_server()->GetURL("/media/getusermedia.html"));
 
   // Test with invalid mandatory audio sourceID.
   NavigateToURL(shell(), url);
-  EXPECT_EQ(kGetUserMediaFailed, ExecuteJavascriptAndReturnResult(
+  ExecuteJavascriptAndWaitForOk(
       GenerateGetUserMediaWithMandatorySourceID(
-          kGetUserMediaAndStop,
+          kGetUserMediaAndExpectFailure,
           "something invalid",
-          video_ids[0])));
+          video_ids[0]));
 
   // Test with invalid mandatory video sourceID.
-  EXPECT_EQ(kGetUserMediaFailed, ExecuteJavascriptAndReturnResult(
+  ExecuteJavascriptAndWaitForOk(
       GenerateGetUserMediaWithMandatorySourceID(
-          kGetUserMediaAndStop,
+          kGetUserMediaAndExpectFailure,
           audio_ids[0],
-          "something invalid")));
+          "something invalid"));
 
   // Test with empty mandatory audio sourceID.
-  EXPECT_EQ(kGetUserMediaFailed, ExecuteJavascriptAndReturnResult(
+  ExecuteJavascriptAndWaitForOk(
       GenerateGetUserMediaWithMandatorySourceID(
-          kGetUserMediaAndStop,
+          kGetUserMediaAndExpectFailure,
           "",
-          video_ids[0])));
+          video_ids[0]));
 }
 
 IN_PROC_BROWSER_TEST_F(WebRtcGetUserMediaBrowserTest,
                        GetUserMediaWithInvalidOptionalSourceID) {
   ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady());
 
   std::vector<std::string> audio_ids;
   std::vector<std::string> video_ids;
   GetSources(&audio_ids, &video_ids);
 
@@ skipping 21 matching lines @@
           "",
           video_ids[0])));
 }
 
 IN_PROC_BROWSER_TEST_F(WebRtcGetUserMediaBrowserTest, TwoGetUserMediaAndStop) {
   ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady());
 
   GURL url(embedded_test_server()->GetURL("/media/getusermedia.html"));
   NavigateToURL(shell(), url);
 
-  ASSERT_TRUE(ExecuteJavascript(
-      "twoGetUserMediaAndStop({video: true, audio: true});"));
-
-  ExpectTitle("OK");
+  ExecuteJavascriptAndWaitForOk(
+      "twoGetUserMediaAndStop({video: true, audio: 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 from VideoCaptureController colorspace conversion and
 // potential resizing.
 IN_PROC_BROWSER_TEST_F(
     WebRtcGetUserMediaBrowserTest,
     TraceVideoCaptureControllerPerformanceDuringGetUserMedia) {
   RunGetUserMediaAndCollectMeasures(
@@ skipping 22 matching lines @@
   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);
 
   // TODO(mcasas): add more aspect ratios, in particular 16:10 crbug.com/275594.
 
   NavigateToURL(shell(), url);
-  ASSERT_TRUE(ExecuteJavascript(constraints_4_3));
-  ExpectTitle("4:3 letterbox");
+  ASSERT_EQ("4:3 letterbox",
+            ExecuteJavascriptAndReturnResult(constraints_4_3));
 }
 
 // This test calls getUserMedia and checks for aspect ratio behavior.
 // TODO(perkj): Enable this test as soon as crbug/349450 is fixed.
 // Currently the render pipeline doesn't support cropping where the new cropped
 // frame doesn't have the same top left coordinates as the original frame.
 IN_PROC_BROWSER_TEST_F(WebRtcGetUserMediaBrowserTest,
                        DISABLED_TestGetUserMediaAspectRatio16To9) {
   ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady());
 
   GURL url(embedded_test_server()->GetURL("/media/getusermedia.html"));
 
   std::string constraints_16_9 = GenerateGetUserMediaCall(
       kGetUserMediaAndAnalyseAndStop, 640, 640, 360, 360, 30, 30);
 
   NavigateToURL(shell(), url);
-  ASSERT_TRUE(ExecuteJavascript(constraints_16_9));
-  ExpectTitle("16:9 letterbox");
+  ASSERT_EQ("16:9 letterbox",
+            ExecuteJavascriptAndReturnResult(constraints_16_9));
 }
 
 namespace {
 
 struct UserMediaSizes {
   int min_width;
   int max_width;
   int min_height;
   int max_height;
   int min_frame_rate;
@@ skipping 21 matching lines @@
 
   std::string call = GenerateGetUserMediaCall(kGetUserMediaAndStop,
                                               user_media().min_width,
                                               user_media().max_width,
                                               user_media().min_height,
                                               user_media().max_height,
                                               user_media().min_frame_rate,
                                               user_media().max_frame_rate);
   DVLOG(1) << "Calling getUserMedia: " << call;
   NavigateToURL(shell(), url);
-  ASSERT_TRUE(ExecuteJavascript(call));
-  ExpectTitle("OK");
+  ExecuteJavascriptAndWaitForOk(call);
 }
 
 static const UserMediaSizes kAllUserMediaSizes[] = {
     {320, 320, 180, 180, 30, 30},
     {320, 320, 240, 240, 30, 30},
     {640, 640, 360, 360, 30, 30},
     {640, 640, 480, 480, 30, 30},
     {960, 960, 720, 720, 30, 30},
     {1280, 1280, 720, 720, 30, 30},
     {1920, 1920, 1080, 1080, 30, 30}};
 
 INSTANTIATE_TEST_CASE_P(UserMedia,
                         WebRtcConstraintsBrowserTest,
                         testing::ValuesIn(kAllUserMediaSizes));
 
 }  // namespace content