| Index: components/invalidation/impl/gcm_network_channel.h
|
| diff --git a/components/invalidation/impl/gcm_network_channel.h b/components/invalidation/impl/gcm_network_channel.h
|
| index ec40aab31cbaff7a2c94102f0734b3455e46f109..f82bb0eac4cd34ccffdd26be5db1828f23e7055a 100644
|
| --- a/components/invalidation/impl/gcm_network_channel.h
|
| +++ b/components/invalidation/impl/gcm_network_channel.h
|
| @@ -10,7 +10,7 @@
|
|
|
| #include "base/compiler_specific.h"
|
| #include "base/macros.h"
|
| -#include "base/threading/non_thread_safe.h"
|
| +#include "base/sequence_checker.h"
|
| #include "components/invalidation/impl/gcm_network_channel_delegate.h"
|
| #include "components/invalidation/impl/sync_system_resources.h"
|
| #include "components/invalidation/public/invalidation_export.h"
|
| @@ -49,8 +49,7 @@ struct GCMNetworkChannelDiagnostic {
|
| class INVALIDATION_EXPORT GCMNetworkChannel
|
| : public SyncNetworkChannel,
|
| public net::URLFetcherDelegate,
|
| - public net::NetworkChangeNotifier::NetworkChangeObserver,
|
| - public base::NonThreadSafe {
|
| + public net::NetworkChangeNotifier::NetworkChangeObserver {
|
| public:
|
| GCMNetworkChannel(
|
| scoped_refptr<net::URLRequestContextGetter> request_context_getter,
|
| @@ -127,6 +126,8 @@ class INVALIDATION_EXPORT GCMNetworkChannel
|
|
|
| GCMNetworkChannelDiagnostic diagnostic_info_;
|
|
|
| + SEQUENCE_CHECKER(sequence_checker_);
|
| +
|
| base::WeakPtrFactory<GCMNetworkChannel> weak_factory_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(GCMNetworkChannel);
|
|
|