| Index: components/invalidation/impl/gcm_invalidation_bridge.h
|
| diff --git a/components/invalidation/impl/gcm_invalidation_bridge.h b/components/invalidation/impl/gcm_invalidation_bridge.h
|
| index c22aeae8215b79dae60a96ea49596fde275bb499..cc1e49a7d878387ca78f32ca11b5f52f02f0ee70 100644
|
| --- a/components/invalidation/impl/gcm_invalidation_bridge.h
|
| +++ b/components/invalidation/impl/gcm_invalidation_bridge.h
|
| @@ -10,7 +10,7 @@
|
| #include "base/callback.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/gcm_driver/common/gcm_messages.h"
|
| #include "components/gcm_driver/gcm_app_handler.h"
|
| #include "components/gcm_driver/gcm_client.h"
|
| @@ -37,8 +37,7 @@ namespace invalidation {
|
| // them.
|
| class GCMInvalidationBridge : public gcm::GCMAppHandler,
|
| public gcm::GCMConnectionObserver,
|
| - public OAuth2TokenService::Consumer,
|
| - public base::NonThreadSafe {
|
| + public OAuth2TokenService::Consumer {
|
| public:
|
| class Core;
|
|
|
| @@ -107,6 +106,8 @@ class GCMInvalidationBridge : public gcm::GCMAppHandler,
|
| request_token_callback_;
|
| bool subscribed_for_incoming_messages_;
|
|
|
| + SEQUENCE_CHECKER(sequence_checker_);
|
| +
|
| base::WeakPtrFactory<GCMInvalidationBridge> weak_factory_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(GCMInvalidationBridge);
|
|
|