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

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

Issue 1615433002: Roll WebRTC 11523:11548, Libjingle 11522:11545 (Closed) Base URL: http://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rolling to webrtc@11548 instead to pull in a fix Created 4 years, 10 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
OLDNEW
1 // Copyright 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 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 <stddef.h> 5 #include <stddef.h>
6 6
7 #include "base/macros.h" 7 #include "base/macros.h"
8 #include "base/strings/string_number_conversions.h" 8 #include "base/strings/string_number_conversions.h"
9 #include "base/strings/utf_string_conversions.h" 9 #include "base/strings/utf_string_conversions.h"
10 #include "content/renderer/media/media_stream_audio_processor_options.h" 10 #include "content/renderer/media/media_stream_audio_processor_options.h"
11 #include "content/renderer/media/mock_constraint_factory.h" 11 #include "content/renderer/media/mock_constraint_factory.h"
12 #include "third_party/libjingle/source/talk/app/webrtc/mediaconstraintsinterface .h" 12 #include "third_party/webrtc/api/mediaconstraintsinterface.h"
13 13
14 namespace content { 14 namespace content {
15 15
16 MockConstraintFactory::MockConstraintFactory() {} 16 MockConstraintFactory::MockConstraintFactory() {}
17 17
18 MockConstraintFactory::~MockConstraintFactory() {} 18 MockConstraintFactory::~MockConstraintFactory() {}
19 19
20 blink::WebMediaTrackConstraintSet& MockConstraintFactory::AddAdvanced() { 20 blink::WebMediaTrackConstraintSet& MockConstraintFactory::AddAdvanced() {
21 advanced_.emplace_back(); 21 advanced_.emplace_back();
22 return advanced_.back(); 22 return advanced_.back();
23 } 23 }
24 24
25 blink::WebMediaConstraints MockConstraintFactory::CreateWebMediaConstraints() 25 blink::WebMediaConstraints MockConstraintFactory::CreateWebMediaConstraints()
26 const { 26 const {
27 blink::WebMediaConstraints constraints; 27 blink::WebMediaConstraints constraints;
28 constraints.initialize(basic_, advanced_); 28 constraints.initialize(basic_, advanced_);
29 return constraints; 29 return constraints;
30 } 30 }
31 31
32 } // namespace content 32 } // namespace content
OLDNEW
« no previous file with comments | « content/renderer/media/media_stream_renderer_factory_impl.cc ('k') | content/renderer/media/mock_data_channel_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698