Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(14)

Unified Diff: base/metrics/sparse_histogram.h

Issue 1852433005: Convert //base to use std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase after r384946 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 | « base/metrics/sample_vector_unittest.cc ('k') | base/metrics/sparse_histogram.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: base/metrics/sparse_histogram.h
diff --git a/base/metrics/sparse_histogram.h b/base/metrics/sparse_histogram.h
index b8767377ab167187cbfca354030afaa66153e0b2..f0296cbb1e1b1a2988020339df236943dc5b6986 100644
--- a/base/metrics/sparse_histogram.h
+++ b/base/metrics/sparse_histogram.h
@@ -9,13 +9,13 @@
#include <stdint.h>
#include <map>
+#include <memory>
#include <string>
#include "base/base_export.h"
#include "base/compiler_specific.h"
#include "base/logging.h"
#include "base/macros.h"
-#include "base/memory/scoped_ptr.h"
#include "base/metrics/histogram_base.h"
#include "base/metrics/sample_map.h"
#include "base/synchronization/lock.h"
@@ -60,7 +60,7 @@ class BASE_EXPORT SparseHistogram : public HistogramBase {
static HistogramBase* FactoryGet(const std::string& name, int32_t flags);
// Create a histogram using data in persistent storage.
- static scoped_ptr<HistogramBase> PersistentCreate(
+ static std::unique_ptr<HistogramBase> PersistentCreate(
PersistentMemoryAllocator* allocator,
const std::string& name,
HistogramSamples::Metadata* meta,
@@ -78,8 +78,8 @@ class BASE_EXPORT SparseHistogram : public HistogramBase {
void AddCount(Sample value, int count) override;
void AddSamples(const HistogramSamples& samples) override;
bool AddSamplesFromPickle(base::PickleIterator* iter) override;
- scoped_ptr<HistogramSamples> SnapshotSamples() const override;
- scoped_ptr<HistogramSamples> SnapshotDelta() override;
+ std::unique_ptr<HistogramSamples> SnapshotSamples() const override;
+ std::unique_ptr<HistogramSamples> SnapshotDelta() override;
void WriteHTMLGraph(std::string* output) const override;
void WriteAscii(std::string* output) const override;
@@ -120,8 +120,8 @@ class BASE_EXPORT SparseHistogram : public HistogramBase {
// Protects access to |samples_|.
mutable base::Lock lock_;
- scoped_ptr<HistogramSamples> samples_;
- scoped_ptr<HistogramSamples> logged_samples_;
+ std::unique_ptr<HistogramSamples> samples_;
+ std::unique_ptr<HistogramSamples> logged_samples_;
DISALLOW_COPY_AND_ASSIGN(SparseHistogram);
};
« no previous file with comments | « base/metrics/sample_vector_unittest.cc ('k') | base/metrics/sparse_histogram.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698