| Index: components/gcm_driver/gcm_stats_recorder_impl.h
 | 
| diff --git a/components/gcm_driver/gcm_stats_recorder_impl.h b/components/gcm_driver/gcm_stats_recorder_impl.h
 | 
| index 390c1062232b872b0f0b417e25785d2ee05a6242..f92be116002885383dbf7fc09f619930df0f80cd 100644
 | 
| --- a/components/gcm_driver/gcm_stats_recorder_impl.h
 | 
| +++ b/components/gcm_driver/gcm_stats_recorder_impl.h
 | 
| @@ -5,10 +5,13 @@
 | 
|  #ifndef COMPONENTS_GCM_DRIVER_GCM_STATS_RECORDER_IMPL_H_
 | 
|  #define COMPONENTS_GCM_DRIVER_GCM_STATS_RECORDER_IMPL_H_
 | 
|  
 | 
| +#include <stdint.h>
 | 
| +
 | 
|  #include <deque>
 | 
|  #include <string>
 | 
|  #include <vector>
 | 
|  
 | 
| +#include "base/macros.h"
 | 
|  #include "base/time/time.h"
 | 
|  #include "components/gcm_driver/gcm_activity.h"
 | 
|  #include "google_apis/gcm/engine/connection_factory.h"
 | 
| @@ -36,13 +39,13 @@ class GCMStatsRecorderImpl : public GCMStatsRecorder {
 | 
|    void Clear();
 | 
|  
 | 
|    // GCMStatsRecorder implementation:
 | 
| -  void RecordCheckinInitiated(uint64 android_id) override;
 | 
| -  void RecordCheckinDelayedDueToBackoff(int64 delay_msec) override;
 | 
| +  void RecordCheckinInitiated(uint64_t android_id) override;
 | 
| +  void RecordCheckinDelayedDueToBackoff(int64_t delay_msec) override;
 | 
|    void RecordCheckinSuccess() override;
 | 
|    void RecordCheckinFailure(const std::string& status,
 | 
|                              bool will_retry) override;
 | 
|    void RecordConnectionInitiated(const std::string& host) override;
 | 
| -  void RecordConnectionDelayedDueToBackoff(int64 delay_msec) override;
 | 
| +  void RecordConnectionDelayedDueToBackoff(int64_t delay_msec) override;
 | 
|    void RecordConnectionSuccess() override;
 | 
|    void RecordConnectionFailure(int network_error) override;
 | 
|    void RecordConnectionResetSignaled(
 | 
| @@ -52,11 +55,10 @@ class GCMStatsRecorderImpl : public GCMStatsRecorder {
 | 
|    void RecordRegistrationResponse(const std::string& app_id,
 | 
|                                    const std::string& source,
 | 
|                                    RegistrationRequest::Status status) override;
 | 
| -  void RecordRegistrationRetryDelayed(
 | 
| -      const std::string& app_id,
 | 
| -      const std::string& source,
 | 
| -      int64 delay_msec,
 | 
| -      int retries_left) override;
 | 
| +  void RecordRegistrationRetryDelayed(const std::string& app_id,
 | 
| +                                      const std::string& source,
 | 
| +                                      int64_t delay_msec,
 | 
| +                                      int retries_left) override;
 | 
|    void RecordUnregistrationSent(const std::string& app_id,
 | 
|                                  const std::string& source) override;
 | 
|    void RecordUnregistrationResponse(
 | 
| @@ -65,7 +67,7 @@ class GCMStatsRecorderImpl : public GCMStatsRecorder {
 | 
|        UnregistrationRequest::Status status) override;
 | 
|    void RecordUnregistrationRetryDelayed(const std::string& app_id,
 | 
|                                          const std::string& source,
 | 
| -                                        int64 delay_msec,
 | 
| +                                        int64_t delay_msec,
 | 
|                                          int retries_left) override;
 | 
|    void RecordDataMessageReceived(const std::string& app_id,
 | 
|                                   const std::string& from,
 | 
| @@ -150,7 +152,7 @@ class GCMStatsRecorderImpl : public GCMStatsRecorder {
 | 
|    bool data_message_received_since_connected_;
 | 
|    base::TimeTicks last_received_data_message_burst_start_time_;
 | 
|    base::TimeTicks last_received_data_message_time_within_burst_;
 | 
| -  int64 received_data_message_burst_size_;
 | 
| +  int64_t received_data_message_burst_size_;
 | 
|  
 | 
|    DISALLOW_COPY_AND_ASSIGN(GCMStatsRecorderImpl);
 | 
|  };
 | 
| 
 |