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

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

Issue 22640017: Passing NULL PeerConnectionIdentityService to Libjingle when Chrome is using openssl. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 7 years, 4 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 | content/renderer/media/peer_connection_identity_service.h » ('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/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 533 matching lines...) Expand 10 before | Expand all | Expand 10 after
544 } 544 }
545 545
546 scoped_refptr<P2PPortAllocatorFactory> pa_factory = 546 scoped_refptr<P2PPortAllocatorFactory> pa_factory =
547 new talk_base::RefCountedObject<P2PPortAllocatorFactory>( 547 new talk_base::RefCountedObject<P2PPortAllocatorFactory>(
548 p2p_socket_dispatcher_.get(), 548 p2p_socket_dispatcher_.get(),
549 network_manager_, 549 network_manager_,
550 socket_factory_.get(), 550 socket_factory_.get(),
551 web_frame); 551 web_frame);
552 552
553 PeerConnectionIdentityService* identity_service = 553 PeerConnectionIdentityService* identity_service =
554 new PeerConnectionIdentityService(GURL(web_frame->document().url().spec()) 554 PeerConnectionIdentityService::Create(
juberti2 2013/08/09 20:23:39 Suggest adding a comment to indicate that a NULL r
555 .GetOrigin()); 555 GURL(web_frame->document().url().spec()).GetOrigin());
556 556
557 return pc_factory_->CreatePeerConnection(ice_servers, 557 return pc_factory_->CreatePeerConnection(ice_servers,
558 constraints, 558 constraints,
559 pa_factory.get(), 559 pa_factory.get(),
560 identity_service, 560 identity_service,
561 observer).get(); 561 observer).get();
562 } 562 }
563 563
564 scoped_refptr<webrtc::MediaStreamInterface> 564 scoped_refptr<webrtc::MediaStreamInterface>
565 MediaStreamDependencyFactory::CreateLocalMediaStream( 565 MediaStreamDependencyFactory::CreateLocalMediaStream(
(...skipping 250 matching lines...) Expand 10 before | Expand all | Expand 10 after
816 } 816 }
817 817
818 // Add the capturer to the WebRtcAudioDeviceImpl if it is a new capturer. 818 // Add the capturer to the WebRtcAudioDeviceImpl if it is a new capturer.
819 if (is_new_capturer) 819 if (is_new_capturer)
820 GetWebRtcAudioDevice()->AddAudioCapturer(capturer); 820 GetWebRtcAudioDevice()->AddAudioCapturer(capturer);
821 821
822 return capturer; 822 return capturer;
823 } 823 }
824 824
825 } // namespace content 825 } // namespace content
OLDNEW
« no previous file with comments | « no previous file | content/renderer/media/peer_connection_identity_service.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698