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

Side by Side Diff: content/renderer/media/mock_peer_connection_impl.cc

Issue 970513005: Roll WebRTC 8573:8602, Libjingle 8571:8600 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Include code updates for interface changes Created 5 years, 9 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 | « DEPS ('k') | content/renderer/media/peer_connection_tracker.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 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "content/renderer/media/mock_peer_connection_impl.h" 5 #include "content/renderer/media/mock_peer_connection_impl.h"
6 6
7 #include <vector> 7 #include <vector>
8 8
9 #include "base/logging.h" 9 #include "base/logging.h"
10 #include "content/renderer/media/mock_data_channel_impl.h" 10 #include "content/renderer/media/mock_data_channel_impl.h"
(...skipping 168 matching lines...) Expand 10 before | Expand all | Expand 10 after
179 StatsOutputLevel level) { 179 StatsOutputLevel level) {
180 if (!getstats_result_) 180 if (!getstats_result_)
181 return false; 181 return false;
182 182
183 DCHECK_EQ(kStatsOutputLevelStandard, level); 183 DCHECK_EQ(kStatsOutputLevelStandard, level);
184 webrtc::StatsReport report1(webrtc::StatsReport::NewTypedId( 184 webrtc::StatsReport report1(webrtc::StatsReport::NewTypedId(
185 webrtc::StatsReport::kStatsReportTypeSsrc, "1234").Pass()); 185 webrtc::StatsReport::kStatsReportTypeSsrc, "1234").Pass());
186 webrtc::StatsReport report2(webrtc::StatsReport::NewTypedId( 186 webrtc::StatsReport report2(webrtc::StatsReport::NewTypedId(
187 webrtc::StatsReport::kStatsReportTypeSession, "nontrack").Pass()); 187 webrtc::StatsReport::kStatsReportTypeSession, "nontrack").Pass());
188 report1.set_timestamp(42); 188 report1.set_timestamp(42);
189 report1.AddValue(webrtc::StatsReport::kStatsValueNameFingerprint, 189 report1.AddString(webrtc::StatsReport::kStatsValueNameFingerprint,
190 "trackvalue"); 190 "trackvalue");
191 191
192 webrtc::StatsReports reports; 192 webrtc::StatsReports reports;
193 reports.push_back(&report1); 193 reports.push_back(&report1);
194 194
195 // If selector is given, we pass back one report. 195 // If selector is given, we pass back one report.
196 // If selector is not given, we pass back two. 196 // If selector is not given, we pass back two.
197 if (!track) { 197 if (!track) {
198 report2.set_timestamp(44); 198 report2.set_timestamp(44);
199 report2.AddValue(webrtc::StatsReport::kStatsValueNameFingerprintAlgorithm, 199 report2.AddString(webrtc::StatsReport::kStatsValueNameFingerprintAlgorithm,
200 "somevalue"); 200 "somevalue");
201 reports.push_back(&report2); 201 reports.push_back(&report2);
202 } 202 }
203 203
204 // Note that the callback is synchronous, not asynchronous; it will 204 // Note that the callback is synchronous, not asynchronous; it will
205 // happen before the request call completes. 205 // happen before the request call completes.
206 observer->OnComplete(reports); 206 observer->OnComplete(reports);
207 207
208 return true; 208 return true;
209 } 209 }
210 210
(...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after
266 sdp_mline_index_ = candidate->sdp_mline_index(); 266 sdp_mline_index_ = candidate->sdp_mline_index();
267 return candidate->ToString(&ice_sdp_); 267 return candidate->ToString(&ice_sdp_);
268 } 268 }
269 269
270 void MockPeerConnectionImpl::RegisterUMAObserver( 270 void MockPeerConnectionImpl::RegisterUMAObserver(
271 webrtc::UMAObserver* observer) { 271 webrtc::UMAObserver* observer) {
272 NOTIMPLEMENTED(); 272 NOTIMPLEMENTED();
273 } 273 }
274 274
275 } // namespace content 275 } // namespace content
OLDNEW
« no previous file with comments | « DEPS ('k') | content/renderer/media/peer_connection_tracker.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698