| Index: jingle/notifier/base/xmpp_connection.h
|
| diff --git a/jingle/notifier/base/xmpp_connection.h b/jingle/notifier/base/xmpp_connection.h
|
| index 1e1c2db601d09d8b65fa9df1ebe17b70411c5bc7..1b6e415536126c56e50241d0aa09b4a347a04f71 100644
|
| --- a/jingle/notifier/base/xmpp_connection.h
|
| +++ b/jingle/notifier/base/xmpp_connection.h
|
| @@ -13,7 +13,7 @@
|
| #include "base/macros.h"
|
| #include "base/memory/ref_counted.h"
|
| #include "base/memory/weak_ptr.h"
|
| -#include "base/threading/non_thread_safe.h"
|
| +#include "base/sequence_checker.h"
|
| #include "net/url_request/url_request_context_getter.h"
|
| #include "third_party/libjingle_xmpp/xmpp/xmppengine.h"
|
| #include "webrtc/base/sigslot.h"
|
| @@ -33,9 +33,7 @@ namespace notifier {
|
|
|
| class WeakXmppClient;
|
|
|
| -class XmppConnection
|
| - : public sigslot::has_slots<>,
|
| - public base::NonThreadSafe {
|
| +class XmppConnection : public sigslot::has_slots<> {
|
| public:
|
| class Delegate {
|
| public:
|
| @@ -99,6 +97,8 @@ class XmppConnection
|
| bool on_connect_called_;
|
| Delegate* delegate_;
|
|
|
| + SEQUENCE_CHECKER(sequence_checker_);
|
| +
|
| DISALLOW_COPY_AND_ASSIGN(XmppConnection);
|
| };
|
|
|
|
|