Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(6)

Side by Side Diff: talk/app/webrtc/statscollector.cc

Issue 1304043008: Replacing SSLIdentity* with scoped_refptr<RTCCertificate> in TransportChannel layer (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Making overriding "virtual" methods use the override keyword Created 5 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | talk/app/webrtc/statscollector_unittest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * libjingle 2 * libjingle
3 * Copyright 2012 Google Inc. 3 * Copyright 2012 Google Inc.
4 * 4 *
5 * Redistribution and use in source and binary forms, with or without 5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions are met: 6 * modification, are permitted provided that the following conditions are met:
7 * 7 *
8 * 1. Redistributions of source code must retain the above copyright notice, 8 * 1. Redistributions of source code must retain the above copyright notice,
9 * this list of conditions and the following disclaimer. 9 * this list of conditions and the following disclaimer.
10 * 2. Redistributions in binary form must reproduce the above copyright notice, 10 * 2. Redistributions in binary form must reproduce the above copyright notice,
(...skipping 696 matching lines...) Expand 10 before | Expand all | Expand 10 after
707 session_->GetTransport(transport_iter.second.content_name); 707 session_->GetTransport(transport_iter.second.content_name);
708 rtc::scoped_refptr<rtc::RTCCertificate> certificate; 708 rtc::scoped_refptr<rtc::RTCCertificate> certificate;
709 if (transport && transport->GetCertificate(&certificate)) { 709 if (transport && transport->GetCertificate(&certificate)) {
710 StatsReport* r = AddCertificateReports(&(certificate->ssl_certificate())); 710 StatsReport* r = AddCertificateReports(&(certificate->ssl_certificate()));
711 if (r) 711 if (r)
712 local_cert_report_id = r->id(); 712 local_cert_report_id = r->id();
713 } 713 }
714 714
715 transport = session_->GetTransport(transport_iter.second.content_name); 715 transport = session_->GetTransport(transport_iter.second.content_name);
716 rtc::scoped_ptr<rtc::SSLCertificate> cert; 716 rtc::scoped_ptr<rtc::SSLCertificate> cert;
717 if (transport && transport->GetRemoteCertificate(cert.accept())) { 717 if (transport && transport->GetRemoteSSLCertificate(cert.accept())) {
718 StatsReport* r = AddCertificateReports(cert.get()); 718 StatsReport* r = AddCertificateReports(cert.get());
719 if (r) 719 if (r)
720 remote_cert_report_id = r->id(); 720 remote_cert_report_id = r->id();
721 } 721 }
722 722
723 for (const auto& channel_iter : transport_iter.second.channel_stats) { 723 for (const auto& channel_iter : transport_iter.second.channel_stats) {
724 StatsReport::Id id(StatsReport::NewComponentId( 724 StatsReport::Id id(StatsReport::NewComponentId(
725 transport_iter.second.content_name, channel_iter.component)); 725 transport_iter.second.content_name, channel_iter.component));
726 StatsReport* channel_report = reports_.ReplaceOrAddNew(id); 726 StatsReport* channel_report = reports_.ReplaceOrAddNew(id);
727 channel_report->set_timestamp(stats_gathering_started_); 727 channel_report->set_timestamp(stats_gathering_started_);
(...skipping 212 matching lines...) Expand 10 before | Expand all | Expand 10 after
940 report->set_timestamp(stats_gathering_started_); 940 report->set_timestamp(stats_gathering_started_);
941 } 941 }
942 942
943 } 943 }
944 944
945 void StatsCollector::ClearUpdateStatsCacheForTest() { 945 void StatsCollector::ClearUpdateStatsCacheForTest() {
946 stats_gathering_started_ = 0; 946 stats_gathering_started_ = 0;
947 } 947 }
948 948
949 } // namespace webrtc 949 } // namespace webrtc
OLDNEW
« no previous file with comments | « no previous file | talk/app/webrtc/statscollector_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698