| Index: components/network_time/network_time_tracker.cc
|
| diff --git a/components/network_time/network_time_tracker.cc b/components/network_time/network_time_tracker.cc
|
| index 76ee415555c4a9d2e0efabd621c4bf627b848d26..17efaff26129b219ab7d2b9525c427346ed8fcab 100644
|
| --- a/components/network_time/network_time_tracker.cc
|
| +++ b/components/network_time/network_time_tracker.cc
|
| @@ -4,13 +4,15 @@
|
|
|
| #include "components/network_time/network_time_tracker.h"
|
|
|
| -#include "base/basictypes.h"
|
| +#include <stdint.h>
|
| +
|
| #include "base/i18n/time_formatting.h"
|
| #include "base/logging.h"
|
| #include "base/prefs/pref_registry_simple.h"
|
| #include "base/prefs/pref_service.h"
|
| #include "base/strings/utf_string_conversions.h"
|
| #include "base/time/tick_clock.h"
|
| +#include "build/build_config.h"
|
| #include "components/network_time/network_time_pref_names.h"
|
|
|
| namespace network_time {
|
| @@ -19,9 +21,9 @@ namespace {
|
|
|
| // Clock resolution is platform dependent.
|
| #if defined(OS_WIN)
|
| -const int64 kTicksResolutionMs = base::Time::kMinLowResolutionThresholdMs;
|
| +const int64_t kTicksResolutionMs = base::Time::kMinLowResolutionThresholdMs;
|
| #else
|
| -const int64 kTicksResolutionMs = 1; // Assume 1ms for non-windows platforms.
|
| +const int64_t kTicksResolutionMs = 1; // Assume 1ms for non-windows platforms.
|
| #endif
|
|
|
| // Number of time measurements performed in a given network time calculation.
|
|
|