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

Unified Diff: content/renderer/media/user_media_client_impl.h

Issue 2909103002: Deprecate NonThreadSafe in content/renderer/media in favor of SequenceChecker. (Closed)
Patch Set: fix compile Created 3 years, 7 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 side-by-side diff with in-line comments
Download patch
Index: content/renderer/media/user_media_client_impl.h
diff --git a/content/renderer/media/user_media_client_impl.h b/content/renderer/media/user_media_client_impl.h
index 040c77d66f93e8868efae69cde565bfb03a9cf70..0e4f587aef068442872418923581d8887bebd493 100644
--- a/content/renderer/media/user_media_client_impl.h
+++ b/content/renderer/media/user_media_client_impl.h
@@ -15,7 +15,7 @@
#include "base/memory/ref_counted.h"
#include "base/memory/weak_ptr.h"
#include "base/optional.h"
-#include "base/threading/non_thread_safe.h"
+#include "base/sequence_checker.h"
#include "content/common/content_export.h"
#include "content/common/media/media_devices.h"
#include "content/common/media/media_devices.mojom.h"
@@ -51,8 +51,7 @@ class VideoCaptureSettings;
class CONTENT_EXPORT UserMediaClientImpl
: public RenderFrameObserver,
NON_EXPORTED_BASE(public blink::WebUserMediaClient),
- public MediaStreamDispatcherEventHandler,
- NON_EXPORTED_BASE(public base::NonThreadSafe) {
+ public MediaStreamDispatcherEventHandler {
public:
// |render_frame| and |dependency_factory| must outlive this instance.
UserMediaClientImpl(
@@ -280,6 +279,8 @@ class CONTENT_EXPORT UserMediaClientImpl
const scoped_refptr<base::TaskRunner> worker_task_runner_;
+ SEQUENCE_CHECKER(sequence_checker_);
+
// Note: This member must be the last to ensure all outstanding weak pointers
// are invalidated first.
base::WeakPtrFactory<UserMediaClientImpl> weak_factory_;

Powered by Google App Engine
This is Rietveld 408576698