| Index: components/metrics/serialization/serialization_utils.h
|
| diff --git a/components/metrics/serialization/serialization_utils.h b/components/metrics/serialization/serialization_utils.h
|
| index 17e5e4cebc550d654296413448af4d6e00ec6b67..202f89c8aad247a76bd094d2c06c12bbc5a7a507 100644
|
| --- a/components/metrics/serialization/serialization_utils.h
|
| +++ b/components/metrics/serialization/serialization_utils.h
|
| @@ -5,9 +5,9 @@
|
| #ifndef COMPONENTS_METRICS_SERIALIZATION_SERIALIZATION_UTILS_H_
|
| #define COMPONENTS_METRICS_SERIALIZATION_SERIALIZATION_UTILS_H_
|
|
|
| +#include <memory>
|
| #include <string>
|
|
|
| -#include "base/memory/scoped_ptr.h"
|
| #include "base/memory/scoped_vector.h"
|
|
|
| namespace metrics {
|
| @@ -21,7 +21,7 @@ namespace SerializationUtils {
|
| // Deserializes a sample passed as a string and return a sample.
|
| // The return value will either be a scoped_ptr to a Metric sample (if the
|
| // deserialization was successful) or a NULL scoped_ptr.
|
| -scoped_ptr<MetricSample> ParseSample(const std::string& sample);
|
| +std::unique_ptr<MetricSample> ParseSample(const std::string& sample);
|
|
|
| // Reads all samples from a file and truncate the file when done.
|
| void ReadAndTruncateMetricsFromFile(const std::string& filename,
|
|
|