| 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 681 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 692 | 692 |
| 693 p2p_socket_dispatcher_ = | 693 p2p_socket_dispatcher_ = |
| 694 new P2PSocketDispatcher(GetIOMessageLoopProxy().get()); | 694 new P2PSocketDispatcher(GetIOMessageLoopProxy().get()); |
| 695 AddFilter(p2p_socket_dispatcher_.get()); | 695 AddFilter(p2p_socket_dispatcher_.get()); |
| 696 | 696 |
| 697 webrtc_identity_service_.reset(new WebRTCIdentityService()); | 697 webrtc_identity_service_.reset(new WebRTCIdentityService()); |
| 698 | 698 |
| 699 peer_connection_factory_.reset( | 699 peer_connection_factory_.reset( |
| 700 new PeerConnectionDependencyFactory(p2p_socket_dispatcher_.get())); | 700 new PeerConnectionDependencyFactory(p2p_socket_dispatcher_.get())); |
| 701 | 701 |
| 702 LOG(ERROR) << "Start MOJO"; |
| 703 audio_output_client_ = new AudioOutputClient(GetServiceRegistry()); |
| 704 |
| 702 aec_dump_message_filter_ = new AecDumpMessageFilter( | 705 aec_dump_message_filter_ = new AecDumpMessageFilter( |
| 703 GetIOMessageLoopProxy(), message_loop()->task_runner(), | 706 GetIOMessageLoopProxy(), message_loop()->task_runner(), |
| 704 peer_connection_factory_.get()); | 707 peer_connection_factory_.get()); |
| 705 | 708 |
| 706 AddFilter(aec_dump_message_filter_.get()); | 709 AddFilter(aec_dump_message_filter_.get()); |
| 707 | 710 |
| 708 #endif // defined(ENABLE_WEBRTC) | 711 #endif // defined(ENABLE_WEBRTC) |
| 709 | 712 |
| 710 audio_input_message_filter_ = | 713 audio_input_message_filter_ = |
| 711 new AudioInputMessageFilter(GetIOMessageLoopProxy()); | 714 new AudioInputMessageFilter(GetIOMessageLoopProxy()); |
| (...skipping 1463 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2175 } | 2178 } |
| 2176 | 2179 |
| 2177 void RenderThreadImpl::PendingRenderFrameConnect::OnConnectionError() { | 2180 void RenderThreadImpl::PendingRenderFrameConnect::OnConnectionError() { |
| 2178 size_t erased = | 2181 size_t erased = |
| 2179 RenderThreadImpl::current()->pending_render_frame_connects_.erase( | 2182 RenderThreadImpl::current()->pending_render_frame_connects_.erase( |
| 2180 routing_id_); | 2183 routing_id_); |
| 2181 DCHECK_EQ(1u, erased); | 2184 DCHECK_EQ(1u, erased); |
| 2182 } | 2185 } |
| 2183 | 2186 |
| 2184 } // namespace content | 2187 } // namespace content |
| OLD | NEW |