components/metrics/histogram_encoder.cc - Issue 1906173002: Convert //components/metrics from scoped_ptr to std::unique_ptr

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: components/metrics/histogram_encoder.cc

Issue 1906173002: Convert //components/metrics from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 4 years, 8 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « components/metrics/file_metrics_provider_unittest.cc ('k') | components/metrics/leak_detector/call_stack_manager_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: components/metrics/histogram_encoder.cc

diff --git a/components/metrics/histogram_encoder.cc b/components/metrics/histogram_encoder.cc

index 595fb5398674c9321a543a0d3b83c9836357365f..61f1d4a86b66ed1416dbd6b261a027f03e19e401 100644

--- a/components/metrics/histogram_encoder.cc

+++ b/components/metrics/histogram_encoder.cc

@@ -4,9 +4,9 @@

#include "components/metrics/histogram_encoder.h"

+#include <memory>

#include <string>

-#include "base/memory/scoped_ptr.h"

#include "base/metrics/histogram.h"

#include "base/metrics/histogram_samples.h"

#include "base/metrics/metrics_hashes.h"

@@ -28,8 +28,8 @@ void EncodeHistogramDelta(const std::string& histogram_name,

if (snapshot.sum() != 0)

histogram_proto->set_sum(snapshot.sum());

- for (scoped_ptr<SampleCountIterator> it = snapshot.Iterator(); !it->Done();

- it->Next()) {

+ for (std::unique_ptr<SampleCountIterator> it = snapshot.Iterator();

+ !it->Done(); it->Next()) {

base::Histogram::Sample min;

base::Histogram::Sample max;

base::Histogram::Count count;