| Index: base/test/histogram_tester_unittest.cc
|
| diff --git a/base/test/histogram_tester_unittest.cc b/base/test/histogram_tester_unittest.cc
|
| index 21b81703c648c28d317dde656f83d7c191bd6081..c4d49af942f783a571b270a591c5b2faaee85e03 100644
|
| --- a/base/test/histogram_tester_unittest.cc
|
| +++ b/base/test/histogram_tester_unittest.cc
|
| @@ -4,7 +4,8 @@
|
|
|
| #include "base/test/histogram_tester.h"
|
|
|
| -#include "base/memory/scoped_ptr.h"
|
| +#include <memory>
|
| +
|
| #include "base/metrics/histogram_macros.h"
|
| #include "base/metrics/histogram_samples.h"
|
| #include "testing/gmock/include/gmock/gmock.h"
|
| @@ -40,7 +41,7 @@ TEST_F(HistogramTesterTest, Scope) {
|
| UMA_HISTOGRAM_BOOLEAN(kHistogram1, true);
|
|
|
| // Verify that one histogram is recorded.
|
| - scoped_ptr<HistogramSamples> samples(
|
| + std::unique_ptr<HistogramSamples> samples(
|
| tester.GetHistogramSamplesSinceCreation(kHistogram1));
|
| EXPECT_TRUE(samples);
|
| EXPECT_EQ(1, samples->TotalCount());
|
| @@ -54,7 +55,7 @@ TEST_F(HistogramTesterTest, GetHistogramSamplesSinceCreationNotNull) {
|
| HistogramTester tester;
|
|
|
| // Verify that the returned samples are empty but not null.
|
| - scoped_ptr<HistogramSamples> samples(
|
| + std::unique_ptr<HistogramSamples> samples(
|
| tester.GetHistogramSamplesSinceCreation(kHistogram1));
|
| EXPECT_TRUE(samples);
|
| tester.ExpectTotalCount(kHistogram, 0);
|
|
|