| Index: content/renderer/media/webrtc/peer_connection_dependency_factory.h
|
| diff --git a/content/renderer/media/webrtc/peer_connection_dependency_factory.h b/content/renderer/media/webrtc/peer_connection_dependency_factory.h
|
| index 37e0b00780cf2ab6b3cd96970e70fd2d63a76ff3..a8c96caec4916dccc8f064ba31a85d57262d4111 100644
|
| --- a/content/renderer/media/webrtc/peer_connection_dependency_factory.h
|
| +++ b/content/renderer/media/webrtc/peer_connection_dependency_factory.h
|
| @@ -22,7 +22,7 @@ namespace base {
|
| class WaitableEvent;
|
| }
|
|
|
| -namespace talk_base {
|
| +namespace rtc {
|
| class NetworkManager;
|
| class PacketSocketFactory;
|
| class Thread;
|
| @@ -179,7 +179,7 @@ class CONTENT_EXPORT PeerConnectionDependencyFactory
|
| // creating PeerConnection objects.
|
| void CreatePeerConnectionFactory();
|
|
|
| - void InitializeWorkerThread(talk_base::Thread** thread,
|
| + void InitializeWorkerThread(rtc::Thread** thread,
|
| base::WaitableEvent* event);
|
|
|
| void CreateIpcNetworkManagerOnWorkerThread(base::WaitableEvent* event);
|
| @@ -206,8 +206,8 @@ class CONTENT_EXPORT PeerConnectionDependencyFactory
|
|
|
| // PeerConnection threads. signaling_thread_ is created from the
|
| // "current" chrome thread.
|
| - talk_base::Thread* signaling_thread_;
|
| - talk_base::Thread* worker_thread_;
|
| + rtc::Thread* signaling_thread_;
|
| + rtc::Thread* worker_thread_;
|
| base::Thread chrome_worker_thread_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(PeerConnectionDependencyFactory);
|
|
|