Index: chrome/browser/metrics/perf/perf_provider_chromeos.cc |
diff --git a/chrome/browser/metrics/perf/perf_provider_chromeos.cc b/chrome/browser/metrics/perf/perf_provider_chromeos.cc |
index c466eee9cf7a2dde3c5039496eabad424cd8dc55..15bcf4cc4736ec4036c32217869321f1c7d64f30 100644 |
--- a/chrome/browser/metrics/perf/perf_provider_chromeos.cc |
+++ b/chrome/browser/metrics/perf/perf_provider_chromeos.cc |
@@ -4,6 +4,8 @@ |
#include "chrome/browser/metrics/perf/perf_provider_chromeos.h" |
+#include <stddef.h> |
+ |
#include <algorithm> |
#include <map> |
#include <string> |
@@ -79,11 +81,11 @@ base::TimeDelta RandomTimeDelta(base::TimeDelta max) { |
// integer, stores the result in |out| and return true. Otherwise return false. |
bool GetInt64Param(const std::map<std::string, std::string>& params, |
const std::string& key, |
- int64* out) { |
+ int64_t* out) { |
auto it = params.find(key); |
if (it == params.end()) |
return false; |
- int64 value; |
+ int64_t value; |
// NB: StringToInt64 will set value even if the conversion fails. |
if (!base::StringToInt64(it->second, &value)) |
return false; |
@@ -200,11 +202,10 @@ PerfProvider::CollectionParams::CollectionParams( |
} |
PerfProvider::CollectionParams::TriggerParams::TriggerParams( |
- int64 sampling_factor, |
+ int64_t sampling_factor, |
base::TimeDelta max_collection_delay) |
: sampling_factor_(sampling_factor), |
- max_collection_delay_(max_collection_delay.ToInternalValue()) { |
-} |
+ max_collection_delay_(max_collection_delay.ToInternalValue()) {} |
const PerfProvider::CollectionParams PerfProvider::kDefaultParameters( |
/* collection_duration = */ base::TimeDelta::FromSeconds(2), |
@@ -307,7 +308,7 @@ std::string FindBestCpuSpecifierFromParams( |
void PerfProvider::SetCollectionParamsFromVariationParams( |
const std::map<std::string, std::string>& params) { |
- int64 value; |
+ int64_t value; |
if (GetInt64Param(params, "ProfileCollectionDurationSec", &value)) { |
collection_params_.set_collection_duration( |
base::TimeDelta::FromSeconds(value)); |
@@ -382,8 +383,8 @@ void PerfProvider::ParseOutputProtoIfValid( |
scoped_ptr<WindowedIncognitoObserver> incognito_observer, |
scoped_ptr<SampledProfile> sampled_profile, |
int result, |
- const std::vector<uint8>& perf_data, |
- const std::vector<uint8>& perf_stat) { |
+ const std::vector<uint8_t>& perf_data, |
+ const std::vector<uint8_t>& perf_stat) { |
DCHECK(CalledOnValidThread()); |
if (incognito_observer->incognito_launched()) { |