| 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/render_thread_impl.h" | 5 #include "content/renderer/render_thread_impl.h" |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 #include <limits> | 8 #include <limits> |
| 9 #include <map> | 9 #include <map> |
| 10 #include <utility> | 10 #include <utility> |
| (...skipping 671 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 682 | 682 |
| 683 p2p_socket_dispatcher_ = | 683 p2p_socket_dispatcher_ = |
| 684 new P2PSocketDispatcher(GetIOMessageLoopProxy().get()); | 684 new P2PSocketDispatcher(GetIOMessageLoopProxy().get()); |
| 685 AddFilter(p2p_socket_dispatcher_.get()); | 685 AddFilter(p2p_socket_dispatcher_.get()); |
| 686 | 686 |
| 687 webrtc_identity_service_.reset(new WebRTCIdentityService()); | 687 webrtc_identity_service_.reset(new WebRTCIdentityService()); |
| 688 | 688 |
| 689 peer_connection_factory_.reset( | 689 peer_connection_factory_.reset( |
| 690 new PeerConnectionDependencyFactory(p2p_socket_dispatcher_.get())); | 690 new PeerConnectionDependencyFactory(p2p_socket_dispatcher_.get())); |
| 691 | 691 |
| 692 LOG(ERROR) << "Start MOJO"; |
| 693 audio_output_client_ = new AudioOutputClient(GetServiceRegistry()); |
| 694 |
| 692 aec_dump_message_filter_ = new AecDumpMessageFilter( | 695 aec_dump_message_filter_ = new AecDumpMessageFilter( |
| 693 GetIOMessageLoopProxy(), message_loop()->task_runner(), | 696 GetIOMessageLoopProxy(), message_loop()->task_runner(), |
| 694 peer_connection_factory_.get()); | 697 peer_connection_factory_.get()); |
| 695 | 698 |
| 696 AddFilter(aec_dump_message_filter_.get()); | 699 AddFilter(aec_dump_message_filter_.get()); |
| 697 | 700 |
| 698 #endif // defined(ENABLE_WEBRTC) | 701 #endif // defined(ENABLE_WEBRTC) |
| 699 | 702 |
| 700 audio_input_message_filter_ = | 703 audio_input_message_filter_ = |
| 701 new AudioInputMessageFilter(GetIOMessageLoopProxy()); | 704 new AudioInputMessageFilter(GetIOMessageLoopProxy()); |
| (...skipping 1438 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2140 } | 2143 } |
| 2141 | 2144 |
| 2142 void RenderThreadImpl::PendingRenderFrameConnect::OnConnectionError() { | 2145 void RenderThreadImpl::PendingRenderFrameConnect::OnConnectionError() { |
| 2143 size_t erased = | 2146 size_t erased = |
| 2144 RenderThreadImpl::current()->pending_render_frame_connects_.erase( | 2147 RenderThreadImpl::current()->pending_render_frame_connects_.erase( |
| 2145 routing_id_); | 2148 routing_id_); |
| 2146 DCHECK_EQ(1u, erased); | 2149 DCHECK_EQ(1u, erased); |
| 2147 } | 2150 } |
| 2148 | 2151 |
| 2149 } // namespace content | 2152 } // namespace content |
| OLD | NEW |