| Index: components/invalidation/impl/sync_invalidation_listener.h
|
| diff --git a/components/invalidation/impl/sync_invalidation_listener.h b/components/invalidation/impl/sync_invalidation_listener.h
|
| index 3ed6cb97313ca13848d98d840ed56c5e5a0eb5ae..85bc467fcfaf8505e4b70ea8b77390ed71bdffba 100644
|
| --- a/components/invalidation/impl/sync_invalidation_listener.h
|
| +++ b/components/invalidation/impl/sync_invalidation_listener.h
|
| @@ -15,7 +15,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 "components/invalidation/impl/invalidation_state_tracker.h"
|
| #include "components/invalidation/impl/state_writer.h"
|
| #include "components/invalidation/impl/sync_system_resources.h"
|
| @@ -36,8 +36,7 @@ class INVALIDATION_EXPORT SyncInvalidationListener
|
| : public NON_EXPORTED_BASE(invalidation::InvalidationListener),
|
| public StateWriter,
|
| public SyncNetworkChannel::Observer,
|
| - public AckHandler,
|
| - public base::NonThreadSafe {
|
| + public AckHandler {
|
| public:
|
| typedef base::Callback<invalidation::InvalidationClient*(
|
| invalidation::SystemResources*,
|
| @@ -174,6 +173,8 @@ class INVALIDATION_EXPORT SyncInvalidationListener
|
| InvalidatorState ticl_state_;
|
| InvalidatorState push_client_state_;
|
|
|
| + SEQUENCE_CHECKER(sequence_checker_);
|
| +
|
| base::WeakPtrFactory<SyncInvalidationListener> weak_ptr_factory_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(SyncInvalidationListener);
|
|
|