Switch to standard integer types in components/, part 2 of 4.

components/invalidation/impl/non_blocking_invalidator.h

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 //
 // An implementation of SyncNotifier that wraps InvalidationNotifier
 // on its own thread.
 
 #ifndef COMPONENTS_INVALIDATION_IMPL_NON_BLOCKING_INVALIDATOR_H_
 #define COMPONENTS_INVALIDATION_IMPL_NON_BLOCKING_INVALIDATOR_H_
 
 #include <string>
 
-#include "base/basictypes.h"
 #include "base/callback.h"
 #include "base/compiler_specific.h"
+#include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/weak_ptr.h"
 #include "components/invalidation/impl/invalidation_state_tracker.h"
 #include "components/invalidation/impl/invalidator.h"
 #include "components/invalidation/impl/invalidator_registrar.h"
 #include "components/invalidation/impl/unacked_invalidation_set.h"
 #include "components/invalidation/public/invalidation_export.h"
 #include "components/invalidation/public/invalidator_state.h"
 #include "jingle/notifier/base/notifier_options.h"
 
@@ skipping 77 matching lines @@
   scoped_refptr<base::SingleThreadTaskRunner> network_task_runner_;
 
   base::WeakPtrFactory<NonBlockingInvalidator> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(NonBlockingInvalidator);
 };
 
 }  // namespace syncer
 
 #endif  // COMPONENTS_INVALIDATION_IMPL_NON_BLOCKING_INVALIDATOR_H_