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

components/invalidation/impl/gcm_network_channel.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.
 
 #ifndef COMPONENTS_INVALIDATION_IMPL_GCM_NETWORK_CHANNEL_H_
 #define COMPONENTS_INVALIDATION_IMPL_GCM_NETWORK_CHANNEL_H_
 
 #include <string>
 
-#include "base/basictypes.h"
 #include "base/compiler_specific.h"
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/threading/non_thread_safe.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"
 #include "net/base/backoff_entry.h"
 #include "net/base/network_change_notifier.h"
 #include "net/url_request/url_fetcher_delegate.h"
 #include "url/gurl.h"
 
@@ skipping 105 matching lines @@
   GCMNetworkChannelDiagnostic diagnostic_info_;
 
   base::WeakPtrFactory<GCMNetworkChannel> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(GCMNetworkChannel);
 };
 
 }  // namespace syncer
 
 #endif  // COMPONENTS_INVALIDATION_IMPL_GCM_NETWORK_CHANNEL_H_