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

components/gcm_driver/gcm_client.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_GCM_DRIVER_GCM_CLIENT_H_
 #define COMPONENTS_GCM_DRIVER_GCM_CLIENT_H_
 
+#include <stdint.h>
+
 #include <map>
 #include <string>
 #include <vector>
 
-#include "base/basictypes.h"
 #include "base/memory/linked_ptr.h"
 #include "base/memory/scoped_ptr.h"
 #include "components/gcm_driver/common/gcm_messages.h"
 #include "components/gcm_driver/gcm_activity.h"
 #include "components/gcm_driver/registration_info.h"
 
 template <class T> class scoped_refptr;
 
 class GURL;
 
@@ skipping 89 matching lines @@
   struct GCMStatistics {
    public:
     GCMStatistics();
     ~GCMStatistics();
 
     bool is_recording;
     bool gcm_client_created;
     std::string gcm_client_state;
     bool connection_client_created;
     std::string connection_state;
-    uint64 android_id;
+    uint64_t android_id;
     std::vector<std::string> registered_app_ids;
     int send_queue_size;
     int resend_queue_size;
 
     RecordedActivities recorded_activities;
   };
 
   // Information about account.
   struct AccountTokenInfo {
     std::string account_id;
@@ skipping 181 matching lines @@
   // to be set, and allows that component to later revoke the setting. It should
   // be unique.
   virtual void AddHeartbeatInterval(const std::string& scope,
                                     int interval_ms) = 0;
   virtual void RemoveHeartbeatInterval(const std::string& scope) = 0;
 };
 
 }  // namespace gcm
 
 #endif  // COMPONENTS_GCM_DRIVER_GCM_CLIENT_H_