| Index: components/metrics/serialization/metric_sample.cc
|
| diff --git a/components/metrics/serialization/metric_sample.cc b/components/metrics/serialization/metric_sample.cc
|
| index 107fc3e0d80f5a8b79432179fe2c2d27159419a0..3fb1f9a41422cf163ccf0fc1a4d13651e82117dc 100644
|
| --- a/components/metrics/serialization/metric_sample.cc
|
| +++ b/components/metrics/serialization/metric_sample.cc
|
| @@ -118,8 +118,8 @@ scoped_ptr<MetricSample> MetricSample::HistogramSample(
|
| // static
|
| scoped_ptr<MetricSample> MetricSample::ParseHistogram(
|
| const std::string& serialized_histogram) {
|
| - std::vector<std::string> parts;
|
| - base::SplitString(serialized_histogram, ' ', &parts);
|
| + std::vector<base::StringPiece> parts = base::SplitStringPiece(
|
| + serialized_histogram, " ", base::KEEP_WHITESPACE, base::SPLIT_WANT_ALL);
|
|
|
| if (parts.size() != 5)
|
| return scoped_ptr<MetricSample>();
|
| @@ -131,7 +131,7 @@ scoped_ptr<MetricSample> MetricSample::ParseHistogram(
|
| return scoped_ptr<MetricSample>();
|
| }
|
|
|
| - return HistogramSample(parts[0], sample, min, max, bucket_count);
|
| + return HistogramSample(parts[0].as_string(), sample, min, max, bucket_count);
|
| }
|
|
|
| // static
|
| @@ -145,15 +145,15 @@ scoped_ptr<MetricSample> MetricSample::SparseHistogramSample(
|
| // static
|
| scoped_ptr<MetricSample> MetricSample::ParseSparseHistogram(
|
| const std::string& serialized_histogram) {
|
| - std::vector<std::string> parts;
|
| - base::SplitString(serialized_histogram, ' ', &parts);
|
| + std::vector<base::StringPiece> parts = base::SplitStringPiece(
|
| + serialized_histogram, " ", base::KEEP_WHITESPACE, base::SPLIT_WANT_ALL);
|
| if (parts.size() != 2)
|
| return scoped_ptr<MetricSample>();
|
| int sample;
|
| if (parts[0].empty() || !base::StringToInt(parts[1], &sample))
|
| return scoped_ptr<MetricSample>();
|
|
|
| - return SparseHistogramSample(parts[0], sample);
|
| + return SparseHistogramSample(parts[0].as_string(), sample);
|
| }
|
|
|
| // static
|
| @@ -168,9 +168,9 @@ scoped_ptr<MetricSample> MetricSample::LinearHistogramSample(
|
| // static
|
| scoped_ptr<MetricSample> MetricSample::ParseLinearHistogram(
|
| const std::string& serialized_histogram) {
|
| - std::vector<std::string> parts;
|
| + std::vector<base::StringPiece> parts = base::SplitStringPiece(
|
| + serialized_histogram, " ", base::KEEP_WHITESPACE, base::SPLIT_WANT_ALL);
|
| int sample, max;
|
| - base::SplitString(serialized_histogram, ' ', &parts);
|
| if (parts.size() != 3)
|
| return scoped_ptr<MetricSample>();
|
| if (parts[0].empty() || !base::StringToInt(parts[1], &sample) ||
|
| @@ -178,7 +178,7 @@ scoped_ptr<MetricSample> MetricSample::ParseLinearHistogram(
|
| return scoped_ptr<MetricSample>();
|
| }
|
|
|
| - return LinearHistogramSample(parts[0], sample, max);
|
| + return LinearHistogramSample(parts[0].as_string(), sample, max);
|
| }
|
|
|
| // static
|
|
|