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

Unified Diff: jingle/notifier/base/weak_xmpp_client.h

Issue 2913673003: Replace deprecated base::NonThreadSafe in jingle in favor of SequenceChecker. (Closed)
Patch Set: 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
« no previous file with comments | « jingle/glue/task_pump.cc ('k') | jingle/notifier/base/weak_xmpp_client.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: jingle/notifier/base/weak_xmpp_client.h
diff --git a/jingle/notifier/base/weak_xmpp_client.h b/jingle/notifier/base/weak_xmpp_client.h
index 16a68dd11015b0aa7156b0dd1c74152e37b947cc..db79c92104541a99fa0b7a3ffe083012a3788b41 100644
--- a/jingle/notifier/base/weak_xmpp_client.h
+++ b/jingle/notifier/base/weak_xmpp_client.h
@@ -12,7 +12,7 @@
#include "base/compiler_specific.h"
#include "base/macros.h"
#include "base/memory/weak_ptr.h"
-#include "base/threading/non_thread_safe.h"
+#include "base/sequence_checker.h"
#include "third_party/libjingle_xmpp/xmpp/xmppclient.h"
namespace rtc {
@@ -24,7 +24,7 @@ namespace notifier {
// buzz::XmppClient's destructor isn't marked virtual, but it inherits
// from rtc::Task, whose destructor *is* marked virtual, so we
// can safely inherit from it.
-class WeakXmppClient : public buzz::XmppClient, public base::NonThreadSafe {
+class WeakXmppClient : public buzz::XmppClient {
public:
explicit WeakXmppClient(rtc::TaskParent* parent);
@@ -43,6 +43,8 @@ class WeakXmppClient : public buzz::XmppClient, public base::NonThreadSafe {
void Stop() override;
private:
+ SEQUENCE_CHECKER(sequence_checker_);
+
// We use our own WeakPtrFactory instead of inheriting from
// SupportsWeakPtr since we want to invalidate in other places
// besides the destructor.
« no previous file with comments | « jingle/glue/task_pump.cc ('k') | jingle/notifier/base/weak_xmpp_client.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698