| OLD | NEW |
| 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/media_stream_dependency_factory.h" | 5 #include "content/renderer/media/media_stream_dependency_factory.h" |
| 6 | 6 |
| 7 #include <vector> | 7 #include <vector> |
| 8 | 8 |
| 9 #include "base/command_line.h" | 9 #include "base/command_line.h" |
| 10 #include "base/strings/utf_string_conversions.h" | 10 #include "base/strings/utf_string_conversions.h" |
| (...skipping 557 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 568 CHECK(observer); | 568 CHECK(observer); |
| 569 | 569 |
| 570 scoped_refptr<P2PPortAllocatorFactory> pa_factory = | 570 scoped_refptr<P2PPortAllocatorFactory> pa_factory = |
| 571 new talk_base::RefCountedObject<P2PPortAllocatorFactory>( | 571 new talk_base::RefCountedObject<P2PPortAllocatorFactory>( |
| 572 p2p_socket_dispatcher_.get(), | 572 p2p_socket_dispatcher_.get(), |
| 573 network_manager_, | 573 network_manager_, |
| 574 socket_factory_.get(), | 574 socket_factory_.get(), |
| 575 web_frame); | 575 web_frame); |
| 576 | 576 |
| 577 PeerConnectionIdentityService* identity_service = | 577 PeerConnectionIdentityService* identity_service = |
| 578 PeerConnectionIdentityService::Create( | 578 new PeerConnectionIdentityService( |
| 579 GURL(web_frame->document().url().spec()).GetOrigin()); | 579 GURL(web_frame->document().url().spec()).GetOrigin()); |
| 580 | 580 |
| 581 return pc_factory_->CreatePeerConnection(ice_servers, | 581 return pc_factory_->CreatePeerConnection(ice_servers, |
| 582 constraints, | 582 constraints, |
| 583 pa_factory.get(), | 583 pa_factory.get(), |
| 584 identity_service, | 584 identity_service, |
| 585 observer).get(); | 585 observer).get(); |
| 586 } | 586 } |
| 587 | 587 |
| 588 scoped_refptr<webrtc::MediaStreamInterface> | 588 scoped_refptr<webrtc::MediaStreamInterface> |
| (...skipping 248 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 837 } | 837 } |
| 838 | 838 |
| 839 // Add the capturer to the WebRtcAudioDeviceImpl if it is a new capturer. | 839 // Add the capturer to the WebRtcAudioDeviceImpl if it is a new capturer. |
| 840 if (is_new_capturer) | 840 if (is_new_capturer) |
| 841 GetWebRtcAudioDevice()->AddAudioCapturer(capturer); | 841 GetWebRtcAudioDevice()->AddAudioCapturer(capturer); |
| 842 | 842 |
| 843 return capturer; | 843 return capturer; |
| 844 } | 844 } |
| 845 | 845 |
| 846 } // namespace content | 846 } // namespace content |
| OLD | NEW |