commit 25e022fd5c00914af5d7dde472260d0a6adb334c
author Taylor Brandstetter <deadbeef@webrtc.org> Thu Mar 08 09:53:47 2018 -0800
committer Commit Bot <commit-bot@chromium.org> Thu Mar 08 19:12:43 2018 +0000
tree 06308a6ad837d704aa7e83cce10490367594ff3a
parent 6328d7cbbc8a72fdc81a766c0bf4039e1e2e7887

Deliver cached stats reports asynchronously.

This has the following benefits:
* Stats reports are always delivered asynchronously. This means the API
  client doesn't need to worry about *possibly* getting a synchronous
  callback depending on when the last report was generated.
* Stats callbacks will always be invoked in the same order that the
  GetStats calls were made, even in cases where a callback recursively
  calls GetStats again.

Bug: webrtc:8973
Change-Id: I94ca4b5dc5c21a8f2df42adfcddf357f40a32025
Reviewed-on: https://webrtc-review.googlesource.com/60473
Commit-Queue: Taylor Brandstetter <deadbeef@webrtc.org>
Reviewed-by: Henrik Boström <hbos@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#22348}

pc/rtcstatscollector_unittest.cc

diff --git a/pc/rtcstatscollector_unittest.cc b/pc/rtcstatscollector_unittest.cc
index 5240e62..42b42dc 100644
--- a/pc/rtcstatscollector_unittest.cc
+++ b/pc/rtcstatscollector_unittest.cc
@@ -1911,9 +1911,9 @@
 }
 
 // Used for test below, to test calling GetStatsReport during a callback.
-class ReentrantCallback : public RTCStatsCollectorCallback {
+class RecursiveCallback : public RTCStatsCollectorCallback {
  public:
-  explicit ReentrantCallback(RTCStatsCollectorWrapper* stats) : stats_(stats) {}
+  explicit RecursiveCallback(RTCStatsCollectorWrapper* stats) : stats_(stats) {}
 
   void OnStatsDelivered(
       const rtc::scoped_refptr<const RTCStatsReport>& report) override {
@@ -1930,11 +1930,11 @@
 
 // Test that nothing bad happens if a callback causes GetStatsReport to be
 // called again recursively. Regression test for crbug.com/webrtc/8973.
-TEST_F(RTCStatsCollectorTest, DoNotCrashOnReentrantInvocation) {
-  rtc::scoped_refptr<ReentrantCallback> callback1(
-      new rtc::RefCountedObject<ReentrantCallback>(stats_.get()));
-  rtc::scoped_refptr<ReentrantCallback> callback2(
-      new rtc::RefCountedObject<ReentrantCallback>(stats_.get()));
+TEST_F(RTCStatsCollectorTest, DoNotCrashWhenGetStatsCalledDuringCallback) {
+  rtc::scoped_refptr<RecursiveCallback> callback1(
+      new rtc::RefCountedObject<RecursiveCallback>(stats_.get()));
+  rtc::scoped_refptr<RecursiveCallback> callback2(
+      new rtc::RefCountedObject<RecursiveCallback>(stats_.get()));
   stats_->stats_collector()->GetStatsReport(callback1);
   stats_->stats_collector()->GetStatsReport(callback2);
   EXPECT_TRUE_WAIT(callback1->called(), kGetStatsReportTimeoutMs);