RTCCertificateStats added.

webrtc/api/rtcstatscollector.h

 /*
  *  Copyright 2016 The WebRTC Project Authors. All rights reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
 #ifndef WEBRTC_API_RTCSTATSCOLLECTOR_H_
 #define WEBRTC_API_RTCSTATSCOLLECTOR_H_
 
 #include <memory>
 #include <vector>
 
 #include "webrtc/api/stats/rtcstats_objects.h"
 #include "webrtc/api/stats/rtcstatsreport.h"
 #include "webrtc/base/asyncinvoker.h"
 #include "webrtc/base/refcount.h"
 #include "webrtc/base/scoped_ref_ptr.h"
 #include "webrtc/base/timeutils.h"
 
+namespace rtc {
+
+class SSLCertificate;
+
+}  // namespace rtc
+
 namespace webrtc {
 
 class PeerConnection;
+struct SessionStats;
 
 class RTCStatsCollectorCallback : public virtual rtc::RefCountInterface {
  public:
   virtual ~RTCStatsCollectorCallback() {}
 
   virtual void OnStatsDelivered(
       const rtc::scoped_refptr<const RTCStatsReport>& report) = 0;
 };
 
 // All public methods of the collector are to be called on the signaling thread.
@@ skipping 25 matching lines @@
   virtual void ProducePartialResultsOnNetworkThread(int64_t timestamp_us);
 
   // Can be called on any thread.
   void AddPartialResults(
       const rtc::scoped_refptr<RTCStatsReport>& partial_report);
 
  private:
   void AddPartialResults_s(rtc::scoped_refptr<RTCStatsReport> partial_report);
   void DeliverCachedReport();
 
-  std::unique_ptr<RTCPeerConnectionStats> ProducePeerConnectionStats_s(
-      int64_t timestamp_us) const;
+  void ProduceCertificateStats_s(

[hta-webrtc, 2016/09/29 13:22:58]

Why the _s suffix? (here and elsewhere)

[hbos, 2016/10/03 12:11:59]

_s for stuff to be executed on the signaling thread, _w for worker thread and _n
for network thread.
So far everything is on the signaling thread, but with some refactoring of
classes used to get the stats I think we can spread the work and avoid several
synchronous thread Invokes (lower priority than adding stats atm).

+      RTCStatsReport* report, int64_t timestamp_us,
+      const SessionStats& session_stats) const;

[hta-webrtc, 2016/09/29 13:22:58]

Order of arguments: First inputs, then outputs.

https://google.github.io/styleguide/cppguide.html#Function_Parameter_Ordering

[hbos, 2016/10/03 12:11:59]

Done.

+  void ProduceCertificateStatsFromSSLCertificateAndChain_s(
+      RTCStatsReport* report, int64_t timestamp_us,
+      const rtc::SSLCertificate* certificate) const;
+  void ProducePeerConnectionStats_s(
+      RTCStatsReport* report, int64_t timestamp_us) const;
 
   PeerConnection* const pc_;
   rtc::Thread* const signaling_thread_;
   rtc::Thread* const worker_thread_;
   rtc::Thread* const network_thread_;
   rtc::AsyncInvoker invoker_;
 
   int num_pending_partial_reports_;
   int64_t partial_report_timestamp_us_;
   rtc::scoped_refptr<RTCStatsReport> partial_report_;
   std::vector<rtc::scoped_refptr<RTCStatsCollectorCallback>> callbacks_;
 
   // A timestamp, in microseconds, that is based on a timer that is
   // monotonically increasing. That is, even if the system clock is modified the
   // difference between the timer and this timestamp is how fresh the cached
   // report is.
   int64_t cache_timestamp_us_;
   int64_t cache_lifetime_us_;
   rtc::scoped_refptr<const RTCStatsReport> cached_report_;
 };
 
 }  // namespace webrtc
 
 #endif  // WEBRTC_API_RTCSTATSCOLLECTOR_H_