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

Side by Side Diff: content/renderer/media/webrtc/peer_connection_dependency_factory.h

Issue 2913693003: Replace deprecated base::NonThreadSafe in content/renderer/media/webrtc in favor of SequenceChecker. (Closed)
Patch Set: move media_stream_remote_video_source.cc to https://codereview.chromium.org/2909103002/ Created 3 years, 6 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
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 #ifndef CONTENT_RENDERER_MEDIA_WEBRTC_PEER_CONNECTION_DEPENDENCY_FACTORY_H_ 5 #ifndef CONTENT_RENDERER_MEDIA_WEBRTC_PEER_CONNECTION_DEPENDENCY_FACTORY_H_
6 #define CONTENT_RENDERER_MEDIA_WEBRTC_PEER_CONNECTION_DEPENDENCY_FACTORY_H_ 6 #define CONTENT_RENDERER_MEDIA_WEBRTC_PEER_CONNECTION_DEPENDENCY_FACTORY_H_
7 7
8 #include <string> 8 #include <string>
9 9
10 #include "base/files/file.h" 10 #include "base/files/file.h"
11 #include "base/macros.h" 11 #include "base/macros.h"
12 #include "base/message_loop/message_loop.h" 12 #include "base/message_loop/message_loop.h"
13 #include "base/sequence_checker.h"
13 #include "base/single_thread_task_runner.h" 14 #include "base/single_thread_task_runner.h"
14 #include "base/threading/thread.h" 15 #include "base/threading/thread.h"
15 #include "content/common/content_export.h" 16 #include "content/common/content_export.h"
16 #include "content/renderer/media/webrtc/stun_field_trial.h" 17 #include "content/renderer/media/webrtc/stun_field_trial.h"
17 #include "content/renderer/p2p/socket_dispatcher.h" 18 #include "content/renderer/p2p/socket_dispatcher.h"
18 #include "ipc/ipc_platform_file.h" 19 #include "ipc/ipc_platform_file.h"
19 #include "third_party/webrtc/api/peerconnectioninterface.h" 20 #include "third_party/webrtc/api/peerconnectioninterface.h"
20 #include "third_party/webrtc/p2p/stunprober/stunprober.h" 21 #include "third_party/webrtc/p2p/stunprober/stunprober.h"
21 22
22 namespace base { 23 namespace base {
(...skipping 15 matching lines...) Expand all
38 } 39 }
39 40
40 namespace content { 41 namespace content {
41 42
42 class IpcNetworkManager; 43 class IpcNetworkManager;
43 class IpcPacketSocketFactory; 44 class IpcPacketSocketFactory;
44 class WebRtcAudioDeviceImpl; 45 class WebRtcAudioDeviceImpl;
45 46
46 // Object factory for RTC PeerConnections. 47 // Object factory for RTC PeerConnections.
47 class CONTENT_EXPORT PeerConnectionDependencyFactory 48 class CONTENT_EXPORT PeerConnectionDependencyFactory
48 : NON_EXPORTED_BASE(base::MessageLoop::DestructionObserver), 49 : NON_EXPORTED_BASE(base::MessageLoop::DestructionObserver) {
49 NON_EXPORTED_BASE(public base::NonThreadSafe) {
50 public: 50 public:
51 PeerConnectionDependencyFactory( 51 PeerConnectionDependencyFactory(
52 P2PSocketDispatcher* p2p_socket_dispatcher); 52 P2PSocketDispatcher* p2p_socket_dispatcher);
53 ~PeerConnectionDependencyFactory() override; 53 ~PeerConnectionDependencyFactory() override;
54 54
55 // Create a RTCPeerConnectionHandler object that implements the 55 // Create a RTCPeerConnectionHandler object that implements the
56 // WebKit WebRTCPeerConnectionHandler interface. 56 // WebKit WebRTCPeerConnectionHandler interface.
57 std::unique_ptr<blink::WebRTCPeerConnectionHandler> 57 std::unique_ptr<blink::WebRTCPeerConnectionHandler>
58 CreateRTCPeerConnectionHandler( 58 CreateRTCPeerConnectionHandler(
59 blink::WebRTCPeerConnectionHandlerClient* client); 59 blink::WebRTCPeerConnectionHandlerClient* client);
(...skipping 87 matching lines...) Expand 10 before | Expand all | Expand 10 after
147 147
148 std::unique_ptr<StunProberTrial> stun_trial_; 148 std::unique_ptr<StunProberTrial> stun_trial_;
149 149
150 // PeerConnection threads. signaling_thread_ is created from the 150 // PeerConnection threads. signaling_thread_ is created from the
151 // "current" chrome thread. 151 // "current" chrome thread.
152 rtc::Thread* signaling_thread_; 152 rtc::Thread* signaling_thread_;
153 rtc::Thread* worker_thread_; 153 rtc::Thread* worker_thread_;
154 base::Thread chrome_signaling_thread_; 154 base::Thread chrome_signaling_thread_;
155 base::Thread chrome_worker_thread_; 155 base::Thread chrome_worker_thread_;
156 156
157 SEQUENCE_CHECKER(sequence_checker_);
158
157 DISALLOW_COPY_AND_ASSIGN(PeerConnectionDependencyFactory); 159 DISALLOW_COPY_AND_ASSIGN(PeerConnectionDependencyFactory);
158 }; 160 };
159 161
160 } // namespace content 162 } // namespace content
161 163
162 #endif // CONTENT_RENDERER_MEDIA_WEBRTC_PEER_CONNECTION_DEPENDENCY_FACTORY_H_ 164 #endif // CONTENT_RENDERER_MEDIA_WEBRTC_PEER_CONNECTION_DEPENDENCY_FACTORY_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698