| Index: base/tracked_objects_unittest.cc
|
| diff --git a/base/tracked_objects_unittest.cc b/base/tracked_objects_unittest.cc
|
| index be86cbbc0822af0ba0617a9b09f375995a218aca..70d9601cd0f9be78570cabab1ce23d7b6413917e 100644
|
| --- a/base/tracked_objects_unittest.cc
|
| +++ b/base/tracked_objects_unittest.cc
|
| @@ -9,7 +9,8 @@
|
| #include <stddef.h>
|
| #include <stdint.h>
|
|
|
| -#include "base/memory/scoped_ptr.h"
|
| +#include <memory>
|
| +
|
| #include "base/process/process_handle.h"
|
| #include "base/time/time.h"
|
| #include "base/tracking_info.h"
|
| @@ -239,7 +240,7 @@ TEST_F(TrackedObjectsTest, TinyStartupShutdown) {
|
| TEST_F(TrackedObjectsTest, DeathDataTestRecordDeath) {
|
| ThreadData::InitializeAndSetTrackingStatus(ThreadData::PROFILING_ACTIVE);
|
|
|
| - scoped_ptr<DeathData> data(new DeathData());
|
| + std::unique_ptr<DeathData> data(new DeathData());
|
| ASSERT_NE(data, nullptr);
|
| EXPECT_EQ(data->run_duration_sum(), 0);
|
| EXPECT_EQ(data->run_duration_max(), 0);
|
| @@ -278,7 +279,7 @@ TEST_F(TrackedObjectsTest, DeathDataTestRecordDeath) {
|
| TEST_F(TrackedObjectsTest, DeathDataTest2Phases) {
|
| ThreadData::InitializeAndSetTrackingStatus(ThreadData::PROFILING_ACTIVE);
|
|
|
| - scoped_ptr<DeathData> data(new DeathData());
|
| + std::unique_ptr<DeathData> data(new DeathData());
|
| ASSERT_NE(data, nullptr);
|
|
|
| int32_t run_ms = 42;
|
|
|