Tracking more WebRTC metrics, corrected others.

chrome/browser/media/webrtc_browsertest_perf.cc

 // Copyright 2013 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 "chrome/browser/media/webrtc_browsertest_perf.h"
 
 #include "base/strings/stringprintf.h"
 #include "base/values.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "testing/perf/perf_test.h"
@@ skipping 27 matching lines @@
 
 static bool MaybePrintResultsForAudioSend(
     const std::string& ssrc, const base::DictionaryValue& pc_dict) {
   std::string value;
   if (!pc_dict.GetString(Statistic("audioInputLevel", ssrc), &value)) {
     // Not an audio send stream.
     return false;
   }
 
   EXPECT_TRUE(pc_dict.GetString(Statistic("bytesSent", ssrc), &value));
-  perf_test::PrintResult("audio_recv", "", "bytes_sent", value, "bytes", false);
+  perf_test::PrintResult("audio_send", "", "bytes_sent", value, "bytes", false);
   EXPECT_TRUE(pc_dict.GetString(Statistic("googJitterReceived", ssrc), &value));
-  perf_test::PrintResult("audio_recv", "", "goog_jitter_recv", value, "",
+  perf_test::PrintResult("audio_send", "", "goog_jitter_recv", value, "",
                          false);
   EXPECT_TRUE(pc_dict.GetString(Statistic("googRtt", ssrc), &value));
-  perf_test::PrintResult("audio_recv", "", "goog_rtt", value, "ms", false);
+  perf_test::PrintResult("audio_send", "", "goog_rtt", value, "ms", false);
   return true;
 }
 
 static bool MaybePrintResultsForVideoReceive(
     const std::string& ssrc, const base::DictionaryValue& pc_dict) {
   std::string value;
   if (!pc_dict.GetString(Statistic("googFrameRateInput", ssrc), &value)) {
     // Not a video receive stream.
     return false;
   }
@@ skipping 10 matching lines @@
   perf_test::PrintResult("video_recv", "", "goog_firs_recv", value, "", false);
   EXPECT_TRUE(pc_dict.GetString(Statistic("googNacksReceived", ssrc), &value));
   perf_test::PrintResult("video_recv", "", "goog_nacks_recv", value, "", false);
   EXPECT_TRUE(pc_dict.GetString(Statistic("googFrameWidthSent", ssrc), &value));
   perf_test::PrintResult("video_recv", "", "goog_frame_width_sent", value,
                          "pixels", false);
   EXPECT_TRUE(
       pc_dict.GetString(Statistic("googFrameHeightSent", ssrc), &value));
   perf_test::PrintResult("video_recv", "", "goog_frame_height_sent", value,
                          "pixels", false);
+  EXPECT_TRUE(pc_dict.GetString(
+      Statistic("googCaptureJitterMs", ssrc), &value));
+  perf_test::PrintResult("video_send", "", "goog_capture_jitter_ms", value,
+                         "ms", false);
+  EXPECT_TRUE(pc_dict.GetString(
+      Statistic("googCaptureQueueDelayMsPerS", ssrc), &value));
+  perf_test::PrintResult("video_send", "", "goog_capture_queue_delay_ms_per_s",
+                         value, "ms/s", false);
+  EXPECT_TRUE(pc_dict.GetString(
+      Statistic("googEncodeUsagePercent", ssrc), &value));
+  perf_test::PrintResult("video_send", "", "goog_encode_usage_percent",
+                         value, "%", false);
+  EXPECT_TRUE(pc_dict.GetString(Statistic("googAvgEncodeMs", ssrc), &value));
+  perf_test::PrintResult("video_send", "", "goog_avg_encode_ms", value, "ms",
+                         false);
+  EXPECT_TRUE(pc_dict.GetString(Statistic("googRtt", ssrc), &value));
+  perf_test::PrintResult("video_send", "", "goog_rtt", value, "ms", false);
   return true;
 }
 
 static bool MaybePrintResultsForVideoSend(
     const std::string& ssrc, const base::DictionaryValue& pc_dict) {
   std::string value;
   if (!pc_dict.GetString(Statistic("googFrameRateOutput", ssrc), &value)) {
     // Not a video receive stream.
     return false;
   }
@@ skipping 100 matching lines @@
     bool did_recognize_stream_type =
         MaybePrintResultsForAudioReceive(ssrc, pc_dict) ||
         MaybePrintResultsForAudioSend(ssrc, pc_dict) ||
         MaybePrintResultsForVideoReceive(ssrc, pc_dict) ||
         MaybePrintResultsForVideoSend(ssrc, pc_dict);
     ASSERT_TRUE(did_recognize_stream_type) << "Failed to figure out which "
                                               "kind of stream SSRC " << ssrc
                                            << " is. ";
   }
 }