diff --git a/base/containers/mru_cache_unittest.cc b/base/containers/mru_cache_unittest.cc index 99b14d1ab5df59..f84fe0db78ec3f 100644 --- a/base/containers/mru_cache_unittest.cc +++ b/base/containers/mru_cache_unittest.cc @@ -245,10 +245,10 @@ TEST(MRUCacheTest, AutoEvict) { Cache cache(kMaxSize); static const int kItem1Key = 1, kItem2Key = 2, kItem3Key = 3, kItem4Key = 4; - cache.Put(kItem1Key, WrapUnique(new CachedItem(20))); - cache.Put(kItem2Key, WrapUnique(new CachedItem(21))); - cache.Put(kItem3Key, WrapUnique(new CachedItem(22))); - cache.Put(kItem4Key, WrapUnique(new CachedItem(23))); + cache.Put(kItem1Key, MakeUnique(20)); + cache.Put(kItem2Key, MakeUnique(21)); + cache.Put(kItem3Key, MakeUnique(22)); + cache.Put(kItem4Key, MakeUnique(23)); // The cache should only have kMaxSize items in it even though we inserted // more. diff --git a/base/debug/activity_analyzer.cc b/base/debug/activity_analyzer.cc index 438c24186f33ba..79d513b5af6c61 100644 --- a/base/debug/activity_analyzer.cc +++ b/base/debug/activity_analyzer.cc @@ -52,10 +52,9 @@ std::unique_ptr GlobalActivityAnalyzer::CreateWithFile( if (!FilePersistentMemoryAllocator::IsFileAcceptable(*mmfile, true)) return nullptr; - return WrapUnique(new GlobalActivityAnalyzer( - WrapUnique(new FilePersistentMemoryAllocator( - std::move(mmfile), 0, 0, base::StringPiece(), - true)))); + return WrapUnique( + new GlobalActivityAnalyzer(MakeUnique( + std::move(mmfile), 0, 0, base::StringPiece(), true))); } #endif // !defined(OS_NACL) diff --git a/base/debug/activity_analyzer_unittest.cc b/base/debug/activity_analyzer_unittest.cc index 6fb6b3f436089b..953a52f02d5caf 100644 --- a/base/debug/activity_analyzer_unittest.cc +++ b/base/debug/activity_analyzer_unittest.cc @@ -61,7 +61,7 @@ class ActivityAnalyzerTest : public testing::Test { std::unique_ptr CreateActivityTracker() { std::unique_ptr memory(new char[kStackSize]); - return WrapUnique(new TestActivityTracker(std::move(memory), kStackSize)); + return MakeUnique(std::move(memory), kStackSize); } static void DoNothing() {} @@ -142,9 +142,8 @@ TEST_F(ActivityAnalyzerTest, GlobalAnalyzerConstruction) { PersistentMemoryAllocator* allocator = GlobalActivityTracker::Get()->allocator(); - GlobalActivityAnalyzer analyzer(WrapUnique( - new PersistentMemoryAllocator(const_cast(allocator->data()), - allocator->size(), 0, 0, "", true))); + GlobalActivityAnalyzer analyzer(MakeUnique( + const_cast(allocator->data()), allocator->size(), 0, 0, "", true)); // The only thread at thois point is the test thread. ThreadActivityAnalyzer* ta1 = analyzer.GetFirstAnalyzer(); diff --git a/base/debug/activity_tracker.cc b/base/debug/activity_tracker.cc index ca5a6c35f0f3a1..dc1f529ad89779 100644 --- a/base/debug/activity_tracker.cc +++ b/base/debug/activity_tracker.cc @@ -481,8 +481,8 @@ void GlobalActivityTracker::CreateWithFile(const FilePath& file_path, {0, static_cast(size)}, MemoryMappedFile::READ_WRITE_EXTEND); DCHECK(success); - CreateWithAllocator(WrapUnique(new FilePersistentMemoryAllocator( - std::move(mapped_file), size, id, name, false)), + CreateWithAllocator(MakeUnique( + std::move(mapped_file), size, id, name, false), stack_depth); } #endif // !defined(OS_NACL) @@ -493,8 +493,7 @@ void GlobalActivityTracker::CreateWithLocalMemory(size_t size, StringPiece name, int stack_depth) { CreateWithAllocator( - WrapUnique(new LocalPersistentMemoryAllocator(size, id, name)), - stack_depth); + MakeUnique(size, id, name), stack_depth); } ThreadActivityTracker* GlobalActivityTracker::CreateTrackerForCurrentThread() { diff --git a/base/debug/activity_tracker_unittest.cc b/base/debug/activity_tracker_unittest.cc index 62c5385f4f8461..f422e50fe26368 100644 --- a/base/debug/activity_tracker_unittest.cc +++ b/base/debug/activity_tracker_unittest.cc @@ -59,7 +59,7 @@ class ActivityTrackerTest : public testing::Test { std::unique_ptr CreateActivityTracker() { std::unique_ptr memory(new char[kStackSize]); - return WrapUnique(new TestActivityTracker(std::move(memory), kStackSize)); + return MakeUnique(std::move(memory), kStackSize); } size_t GetGlobalActiveTrackerCount() { diff --git a/base/files/important_file_writer_unittest.cc b/base/files/important_file_writer_unittest.cc index 6b5e32d85f43f6..3fd71e75949a2b 100644 --- a/base/files/important_file_writer_unittest.cc +++ b/base/files/important_file_writer_unittest.cc @@ -104,7 +104,7 @@ TEST_F(ImportantFileWriterTest, Basic) { ImportantFileWriter writer(file_, ThreadTaskRunnerHandle::Get()); EXPECT_FALSE(PathExists(writer.path())); EXPECT_FALSE(successful_write_observer_.GetAndResetObservationState()); - writer.WriteNow(WrapUnique(new std::string("foo"))); + writer.WriteNow(MakeUnique("foo")); RunLoop().RunUntilIdle(); EXPECT_FALSE(successful_write_observer_.GetAndResetObservationState()); @@ -117,7 +117,7 @@ TEST_F(ImportantFileWriterTest, BasicWithSuccessfulWriteObserver) { EXPECT_FALSE(PathExists(writer.path())); EXPECT_FALSE(successful_write_observer_.GetAndResetObservationState()); successful_write_observer_.ObserveNextSuccessfulWrite(&writer); - writer.WriteNow(WrapUnique(new std::string("foo"))); + writer.WriteNow(MakeUnique("foo")); RunLoop().RunUntilIdle(); // Confirm that the observer is invoked. @@ -128,7 +128,7 @@ TEST_F(ImportantFileWriterTest, BasicWithSuccessfulWriteObserver) { // Confirm that re-installing the observer works for another write. EXPECT_FALSE(successful_write_observer_.GetAndResetObservationState()); successful_write_observer_.ObserveNextSuccessfulWrite(&writer); - writer.WriteNow(WrapUnique(new std::string("bar"))); + writer.WriteNow(MakeUnique("bar")); RunLoop().RunUntilIdle(); EXPECT_TRUE(successful_write_observer_.GetAndResetObservationState()); @@ -138,7 +138,7 @@ TEST_F(ImportantFileWriterTest, BasicWithSuccessfulWriteObserver) { // Confirm that writing again without re-installing the observer doesn't // result in a notification. EXPECT_FALSE(successful_write_observer_.GetAndResetObservationState()); - writer.WriteNow(WrapUnique(new std::string("baz"))); + writer.WriteNow(MakeUnique("baz")); RunLoop().RunUntilIdle(); EXPECT_FALSE(successful_write_observer_.GetAndResetObservationState()); diff --git a/base/json/json_writer_unittest.cc b/base/json/json_writer_unittest.cc index 233ac5e8678511..03f803f03fea1a 100644 --- a/base/json/json_writer_unittest.cc +++ b/base/json/json_writer_unittest.cc @@ -61,7 +61,7 @@ TEST(JSONWriterTest, NestedTypes) { std::unique_ptr inner_dict(new DictionaryValue()); inner_dict->SetInteger("inner int", 10); list->Append(std::move(inner_dict)); - list->Append(WrapUnique(new ListValue())); + list->Append(MakeUnique()); list->AppendBoolean(true); root_dict.Set("list", std::move(list)); @@ -119,9 +119,9 @@ TEST(JSONWriterTest, BinaryValues) { ListValue binary_list; binary_list.Append(BinaryValue::CreateWithCopiedBuffer("asdf", 4)); - binary_list.Append(WrapUnique(new FundamentalValue(5))); + binary_list.Append(MakeUnique(5)); binary_list.Append(BinaryValue::CreateWithCopiedBuffer("asdf", 4)); - binary_list.Append(WrapUnique(new FundamentalValue(2))); + binary_list.Append(MakeUnique(2)); binary_list.Append(BinaryValue::CreateWithCopiedBuffer("asdf", 4)); EXPECT_FALSE(JSONWriter::Write(binary_list, &output_js)); EXPECT_TRUE(JSONWriter::WriteWithOptions( diff --git a/base/message_loop/message_pump_perftest.cc b/base/message_loop/message_pump_perftest.cc index 387927d38b3596..3baa6147fe10d8 100644 --- a/base/message_loop/message_pump_perftest.cc +++ b/base/message_loop/message_pump_perftest.cc @@ -95,8 +95,7 @@ class ScheduleWorkTest : public testing::Test { max_batch_times_.reset(new base::TimeDelta[num_scheduling_threads]); for (int i = 0; i < num_scheduling_threads; ++i) { - scheduling_threads.push_back( - WrapUnique(new Thread("posting thread"))); + scheduling_threads.push_back(MakeUnique("posting thread")); scheduling_threads[i]->Start(); } diff --git a/base/metrics/histogram.cc b/base/metrics/histogram.cc index b4a6bd4e1af263..ab6cdd0f2d6ba3 100644 --- a/base/metrics/histogram.cc +++ b/base/metrics/histogram.cc @@ -752,8 +752,7 @@ class LinearHistogram::Factory : public Histogram::Factory { std::unique_ptr HeapAlloc( const BucketRanges* ranges) override { - return WrapUnique( - new LinearHistogram(name_, minimum_, maximum_, ranges)); + return WrapUnique(new LinearHistogram(name_, minimum_, maximum_, ranges)); } void FillHistogram(HistogramBase* base_histogram) override { diff --git a/base/metrics/persistent_histogram_allocator.cc b/base/metrics/persistent_histogram_allocator.cc index cad464227d2027..c4d8c95d68da1b 100644 --- a/base/metrics/persistent_histogram_allocator.cc +++ b/base/metrics/persistent_histogram_allocator.cc @@ -117,7 +117,7 @@ PersistentSparseHistogramDataManager::GetSampleMapRecordsWhileLocked( return found->second.get(); std::unique_ptr& samples = sample_records_[id]; - samples = WrapUnique(new PersistentSampleMapRecords(this, id)); + samples = MakeUnique(this, id); return samples.get(); } @@ -670,9 +670,9 @@ void GlobalHistogramAllocator::CreateWithPersistentMemory( size_t page_size, uint64_t id, StringPiece name) { - Set(WrapUnique(new GlobalHistogramAllocator( - WrapUnique(new PersistentMemoryAllocator( - base, size, page_size, id, name, false))))); + Set(WrapUnique( + new GlobalHistogramAllocator(MakeUnique( + base, size, page_size, id, name, false)))); } // static @@ -681,7 +681,7 @@ void GlobalHistogramAllocator::CreateWithLocalMemory( uint64_t id, StringPiece name) { Set(WrapUnique(new GlobalHistogramAllocator( - WrapUnique(new LocalPersistentMemoryAllocator(size, id, name))))); + MakeUnique(size, id, name)))); } #if !defined(OS_NACL) @@ -709,9 +709,9 @@ void GlobalHistogramAllocator::CreateWithFile( return; } - Set(WrapUnique(new GlobalHistogramAllocator( - WrapUnique(new FilePersistentMemoryAllocator( - std::move(mmfile), size, id, name, false))))); + Set(WrapUnique( + new GlobalHistogramAllocator(MakeUnique( + std::move(mmfile), size, id, name, false)))); } #endif @@ -728,9 +728,9 @@ void GlobalHistogramAllocator::CreateWithSharedMemory( } DCHECK_LE(memory->mapped_size(), size); - Set(WrapUnique(new GlobalHistogramAllocator( - WrapUnique(new SharedPersistentMemoryAllocator( - std::move(memory), 0, StringPiece(), /*readonly=*/false))))); + Set(WrapUnique( + new GlobalHistogramAllocator(MakeUnique( + std::move(memory), 0, StringPiece(), /*readonly=*/false)))); } // static @@ -745,9 +745,9 @@ void GlobalHistogramAllocator::CreateWithSharedMemoryHandle( return; } - Set(WrapUnique(new GlobalHistogramAllocator( - WrapUnique(new SharedPersistentMemoryAllocator( - std::move(shm), 0, StringPiece(), /*readonly=*/false))))); + Set(WrapUnique( + new GlobalHistogramAllocator(MakeUnique( + std::move(shm), 0, StringPiece(), /*readonly=*/false)))); } // static diff --git a/base/metrics/persistent_histogram_allocator_unittest.cc b/base/metrics/persistent_histogram_allocator_unittest.cc index 6f9ed96481cace..9604ce6b39b14e 100644 --- a/base/metrics/persistent_histogram_allocator_unittest.cc +++ b/base/metrics/persistent_histogram_allocator_unittest.cc @@ -102,9 +102,8 @@ TEST_F(PersistentHistogramAllocatorTest, CreateAndIterateTest) { // Create a second allocator and have it access the memory of the first. std::unique_ptr recovered; - PersistentHistogramAllocator recovery( - WrapUnique(new PersistentMemoryAllocator( - allocator_memory_.get(), kAllocatorMemorySize, 0, 0, "", false))); + PersistentHistogramAllocator recovery(MakeUnique( + allocator_memory_.get(), kAllocatorMemorySize, 0, 0, "", false)); PersistentHistogramAllocator::Iterator histogram_iter(&recovery); recovered = histogram_iter.GetNext(); @@ -181,9 +180,8 @@ TEST_F(PersistentHistogramAllocatorTest, StatisticsRecorderTest) { // Create a second allocator and have it access the memory of the first. std::unique_ptr recovered; - PersistentHistogramAllocator recovery( - WrapUnique(new PersistentMemoryAllocator( - allocator_memory_.get(), kAllocatorMemorySize, 0, 0, "", false))); + PersistentHistogramAllocator recovery(MakeUnique( + allocator_memory_.get(), kAllocatorMemorySize, 0, 0, "", false)); PersistentHistogramAllocator::Iterator histogram_iter(&recovery); recovered = histogram_iter.GetNext(); diff --git a/base/metrics/persistent_sample_map_unittest.cc b/base/metrics/persistent_sample_map_unittest.cc index c3f2474b8617ef..8c3ac25dea4863 100644 --- a/base/metrics/persistent_sample_map_unittest.cc +++ b/base/metrics/persistent_sample_map_unittest.cc @@ -16,16 +16,16 @@ namespace { std::unique_ptr CreateHistogramAllocator( size_t bytes) { - return WrapUnique(new PersistentHistogramAllocator( - WrapUnique(new LocalPersistentMemoryAllocator(bytes, 0, "")))); + return MakeUnique( + MakeUnique(bytes, 0, "")); } std::unique_ptr DuplicateHistogramAllocator( PersistentHistogramAllocator* original) { - return WrapUnique( - new PersistentHistogramAllocator(WrapUnique(new PersistentMemoryAllocator( + return MakeUnique( + MakeUnique( const_cast(original->data()), original->length(), 0, - original->Id(), original->Name(), false)))); + original->Id(), original->Name(), false)); } TEST(PersistentSampleMapTest, AccumulateTest) { diff --git a/base/task_scheduler/priority_queue_unittest.cc b/base/task_scheduler/priority_queue_unittest.cc index 3984a2152153f9..3762856061f05f 100644 --- a/base/task_scheduler/priority_queue_unittest.cc +++ b/base/task_scheduler/priority_queue_unittest.cc @@ -58,27 +58,27 @@ class ThreadBeginningTransaction : public SimpleThread { TEST(TaskSchedulerPriorityQueueTest, PushPopPeek) { // Create test sequences. scoped_refptr sequence_a(new Sequence); - sequence_a->PushTask(WrapUnique(new Task( + sequence_a->PushTask(MakeUnique( FROM_HERE, Closure(), - TaskTraits().WithPriority(TaskPriority::USER_VISIBLE), TimeDelta()))); + TaskTraits().WithPriority(TaskPriority::USER_VISIBLE), TimeDelta())); SequenceSortKey sort_key_a = sequence_a->GetSortKey(); scoped_refptr sequence_b(new Sequence); - sequence_b->PushTask(WrapUnique(new Task( + sequence_b->PushTask(MakeUnique( FROM_HERE, Closure(), - TaskTraits().WithPriority(TaskPriority::USER_BLOCKING), TimeDelta()))); + TaskTraits().WithPriority(TaskPriority::USER_BLOCKING), TimeDelta())); SequenceSortKey sort_key_b = sequence_b->GetSortKey(); scoped_refptr sequence_c(new Sequence); - sequence_c->PushTask(WrapUnique(new Task( + sequence_c->PushTask(MakeUnique( FROM_HERE, Closure(), - TaskTraits().WithPriority(TaskPriority::USER_BLOCKING), TimeDelta()))); + TaskTraits().WithPriority(TaskPriority::USER_BLOCKING), TimeDelta())); SequenceSortKey sort_key_c = sequence_c->GetSortKey(); scoped_refptr sequence_d(new Sequence); - sequence_d->PushTask(WrapUnique(new Task( + sequence_d->PushTask(MakeUnique( FROM_HERE, Closure(), TaskTraits().WithPriority(TaskPriority::BACKGROUND), - TimeDelta()))); + TimeDelta())); SequenceSortKey sort_key_d = sequence_d->GetSortKey(); // Create a PriorityQueue and a Transaction. diff --git a/base/task_scheduler/scheduler_service_thread.cc b/base/task_scheduler/scheduler_service_thread.cc index 87eeed3bee20bc..9f6936ba47a8c6 100644 --- a/base/task_scheduler/scheduler_service_thread.cc +++ b/base/task_scheduler/scheduler_service_thread.cc @@ -76,12 +76,10 @@ SchedulerServiceThread::~SchedulerServiceThread() = default; // static std::unique_ptr SchedulerServiceThread::Create( TaskTracker* task_tracker, DelayedTaskManager* delayed_task_manager) { - std::unique_ptr worker = - SchedulerWorker::Create( - ThreadPriority::NORMAL, - WrapUnique(new ServiceThreadDelegate(delayed_task_manager)), - task_tracker, - SchedulerWorker::InitialState::ALIVE); + std::unique_ptr worker = SchedulerWorker::Create( + ThreadPriority::NORMAL, + MakeUnique(delayed_task_manager), task_tracker, + SchedulerWorker::InitialState::ALIVE); if (!worker) return nullptr; diff --git a/base/task_scheduler/scheduler_worker_pool_impl.cc b/base/task_scheduler/scheduler_worker_pool_impl.cc index 3774c47f082d85..e5599dd6e6e3ae 100644 --- a/base/task_scheduler/scheduler_worker_pool_impl.cc +++ b/base/task_scheduler/scheduler_worker_pool_impl.cc @@ -61,7 +61,7 @@ class SchedulerParallelTaskRunner : public TaskRunner { TimeDelta delay) override { // Post the task as part of a one-off single-task Sequence. return worker_pool_->PostTaskWithSequence( - WrapUnique(new Task(from_here, closure, traits_, delay)), + MakeUnique(from_here, closure, traits_, delay), make_scoped_refptr(new Sequence), nullptr); } @@ -643,9 +643,9 @@ bool SchedulerWorkerPoolImpl::Initialize( for (size_t i = 0; i < max_threads; ++i) { std::unique_ptr worker = SchedulerWorker::Create( - priority_hint, WrapUnique(new SchedulerWorkerDelegateImpl( + priority_hint, MakeUnique( this, re_enqueue_sequence_callback, - &shared_priority_queue_, static_cast(i))), + &shared_priority_queue_, static_cast(i)), task_tracker_, i == 0 ? SchedulerWorker::InitialState::ALIVE : SchedulerWorker::InitialState::DETACHED); if (!worker) diff --git a/base/task_scheduler/scheduler_worker_pool_impl_unittest.cc b/base/task_scheduler/scheduler_worker_pool_impl_unittest.cc index ed222e09e834de..bbc6723c6671ad 100644 --- a/base/task_scheduler/scheduler_worker_pool_impl_unittest.cc +++ b/base/task_scheduler/scheduler_worker_pool_impl_unittest.cc @@ -171,9 +171,9 @@ TEST_P(TaskSchedulerWorkerPoolImplTest, PostTasks) { // Create threads to post tasks. std::vector> threads_posting_tasks; for (size_t i = 0; i < kNumThreadsPostingTasks; ++i) { - threads_posting_tasks.push_back(WrapUnique(new ThreadPostingTasks( + threads_posting_tasks.push_back(MakeUnique( worker_pool_.get(), GetParam(), WaitBeforePostTask::NO_WAIT, - PostNestedTask::NO))); + PostNestedTask::NO)); threads_posting_tasks.back()->Start(); } @@ -194,9 +194,9 @@ TEST_P(TaskSchedulerWorkerPoolImplTest, PostTasksWaitAllWorkersIdle) { // posting a new task. std::vector> threads_posting_tasks; for (size_t i = 0; i < kNumThreadsPostingTasks; ++i) { - threads_posting_tasks.push_back(WrapUnique(new ThreadPostingTasks( + threads_posting_tasks.push_back(MakeUnique( worker_pool_.get(), GetParam(), - WaitBeforePostTask::WAIT_FOR_ALL_WORKERS_IDLE, PostNestedTask::NO))); + WaitBeforePostTask::WAIT_FOR_ALL_WORKERS_IDLE, PostNestedTask::NO)); threads_posting_tasks.back()->Start(); } @@ -216,9 +216,9 @@ TEST_P(TaskSchedulerWorkerPoolImplTest, NestedPostTasks) { // another task when it runs. std::vector> threads_posting_tasks; for (size_t i = 0; i < kNumThreadsPostingTasks; ++i) { - threads_posting_tasks.push_back(WrapUnique(new ThreadPostingTasks( + threads_posting_tasks.push_back(MakeUnique( worker_pool_.get(), GetParam(), WaitBeforePostTask::NO_WAIT, - PostNestedTask::YES))); + PostNestedTask::YES)); threads_posting_tasks.back()->Start(); } @@ -241,9 +241,9 @@ TEST_P(TaskSchedulerWorkerPoolImplTest, PostTasksWithOneAvailableWorker) { WaitableEvent::InitialState::NOT_SIGNALED); std::vector> blocked_task_factories; for (size_t i = 0; i < (kNumWorkersInWorkerPool - 1); ++i) { - blocked_task_factories.push_back(WrapUnique(new test::TestTaskFactory( + blocked_task_factories.push_back(MakeUnique( worker_pool_->CreateTaskRunnerWithTraits(TaskTraits(), GetParam()), - GetParam()))); + GetParam())); EXPECT_TRUE(blocked_task_factories.back()->PostTask( PostNestedTask::NO, Bind(&WaitableEvent::Wait, Unretained(&event)))); blocked_task_factories.back()->WaitForAllTasksToRun(); @@ -275,9 +275,9 @@ TEST_P(TaskSchedulerWorkerPoolImplTest, Saturate) { WaitableEvent::InitialState::NOT_SIGNALED); std::vector> factories; for (size_t i = 0; i < kNumWorkersInWorkerPool; ++i) { - factories.push_back(WrapUnique(new test::TestTaskFactory( + factories.push_back(MakeUnique( worker_pool_->CreateTaskRunnerWithTraits(TaskTraits(), GetParam()), - GetParam()))); + GetParam())); EXPECT_TRUE(factories.back()->PostTask( PostNestedTask::NO, Bind(&WaitableEvent::Wait, Unretained(&event)))); factories.back()->WaitForAllTasksToRun(); diff --git a/base/task_scheduler/scheduler_worker_unittest.cc b/base/task_scheduler/scheduler_worker_unittest.cc index 2a338cb31310cf..631fa7801102a6 100644 --- a/base/task_scheduler/scheduler_worker_unittest.cc +++ b/base/task_scheduler/scheduler_worker_unittest.cc @@ -71,10 +71,8 @@ class TaskSchedulerWorkerTest : public testing::TestWithParam { void SetUp() override { worker_ = SchedulerWorker::Create( - ThreadPriority::NORMAL, - WrapUnique(new TestSchedulerWorkerDelegate(this)), - &task_tracker_, - SchedulerWorker::InitialState::ALIVE); + ThreadPriority::NORMAL, MakeUnique(this), + &task_tracker_, SchedulerWorker::InitialState::ALIVE); ASSERT_TRUE(worker_); worker_set_.Signal(); main_entry_called_.Wait(); diff --git a/base/task_scheduler/sequence_unittest.cc b/base/task_scheduler/sequence_unittest.cc index 5da03f22591380..41a9794ac61d1a 100644 --- a/base/task_scheduler/sequence_unittest.cc +++ b/base/task_scheduler/sequence_unittest.cc @@ -216,9 +216,9 @@ TEST_F(TaskSchedulerSequenceTest, GetSortKey) { TEST_F(TaskSchedulerSequenceTest, CanPushTaskInTaskDestructor) { scoped_refptr sequence(new Sequence); - sequence->PushTask(WrapUnique( - new Task(FROM_HERE, Bind(&DoNothing, PushTaskInDestructor(sequence)), - TaskTraits(), TimeDelta()))); + sequence->PushTask(MakeUnique( + FROM_HERE, Bind(&DoNothing, PushTaskInDestructor(sequence)), TaskTraits(), + TimeDelta())); // PushTask() is invoked on |sequence| when the popped Task is destroyed. If // PopTask() destroys the Task outside the scope of its lock as expected, no diff --git a/base/task_scheduler/task_scheduler_impl.cc b/base/task_scheduler/task_scheduler_impl.cc index 4487b09814d237..d93c62023e8107 100644 --- a/base/task_scheduler/task_scheduler_impl.cc +++ b/base/task_scheduler/task_scheduler_impl.cc @@ -41,7 +41,7 @@ void TaskSchedulerImpl::PostTaskWithTraits( const Closure& task) { // Post |task| as part of a one-off single-task Sequence. GetWorkerPoolForTraits(traits)->PostTaskWithSequence( - WrapUnique(new Task(from_here, task, traits, TimeDelta())), + MakeUnique(from_here, task, traits, TimeDelta()), make_scoped_refptr(new Sequence), nullptr); } diff --git a/base/task_scheduler/task_tracker_unittest.cc b/base/task_scheduler/task_tracker_unittest.cc index 25ec8b54829500..b6c1c207d19087 100644 --- a/base/task_scheduler/task_tracker_unittest.cc +++ b/base/task_scheduler/task_tracker_unittest.cc @@ -120,10 +120,10 @@ class TaskSchedulerTaskTrackerTest // Creates a task with |shutdown_behavior|. std::unique_ptr CreateTask(TaskShutdownBehavior shutdown_behavior) { - return WrapUnique(new Task( + return MakeUnique( FROM_HERE, Bind(&TaskSchedulerTaskTrackerTest::RunTaskCallback, Unretained(this)), - TaskTraits().WithShutdownBehavior(shutdown_behavior), TimeDelta())); + TaskTraits().WithShutdownBehavior(shutdown_behavior), TimeDelta()); } // Calls tracker_->Shutdown() on a new thread. When this returns, Shutdown() @@ -496,21 +496,21 @@ TEST_F(TaskSchedulerTaskTrackerTest, LoadWillPostAndRunBeforeShutdown) { for (size_t i = 0; i < kLoadTestNumIterations; ++i) { tasks.push_back(CreateTask(TaskShutdownBehavior::CONTINUE_ON_SHUTDOWN)); - threads.push_back(WrapUnique(new ThreadPostingAndRunningTask( + threads.push_back(MakeUnique( &tracker_, tasks.back().get(), - ThreadPostingAndRunningTask::Action::WILL_POST_AND_RUN, true))); + ThreadPostingAndRunningTask::Action::WILL_POST_AND_RUN, true)); threads.back()->Start(); tasks.push_back(CreateTask(TaskShutdownBehavior::SKIP_ON_SHUTDOWN)); - threads.push_back(WrapUnique(new ThreadPostingAndRunningTask( + threads.push_back(MakeUnique( &tracker_, tasks.back().get(), - ThreadPostingAndRunningTask::Action::WILL_POST_AND_RUN, true))); + ThreadPostingAndRunningTask::Action::WILL_POST_AND_RUN, true)); threads.back()->Start(); tasks.push_back(CreateTask(TaskShutdownBehavior::BLOCK_SHUTDOWN)); - threads.push_back(WrapUnique(new ThreadPostingAndRunningTask( + threads.push_back(MakeUnique( &tracker_, tasks.back().get(), - ThreadPostingAndRunningTask::Action::WILL_POST_AND_RUN, true))); + ThreadPostingAndRunningTask::Action::WILL_POST_AND_RUN, true)); threads.back()->Start(); } @@ -532,21 +532,21 @@ TEST_F(TaskSchedulerTaskTrackerTest, for (size_t i = 0; i < kLoadTestNumIterations; ++i) { tasks.push_back(CreateTask(TaskShutdownBehavior::CONTINUE_ON_SHUTDOWN)); - post_threads.push_back(WrapUnique(new ThreadPostingAndRunningTask( + post_threads.push_back(MakeUnique( &tracker_, tasks.back().get(), - ThreadPostingAndRunningTask::Action::WILL_POST, true))); + ThreadPostingAndRunningTask::Action::WILL_POST, true)); post_threads.back()->Start(); tasks.push_back(CreateTask(TaskShutdownBehavior::SKIP_ON_SHUTDOWN)); - post_threads.push_back(WrapUnique(new ThreadPostingAndRunningTask( + post_threads.push_back(MakeUnique( &tracker_, tasks.back().get(), - ThreadPostingAndRunningTask::Action::WILL_POST, true))); + ThreadPostingAndRunningTask::Action::WILL_POST, true)); post_threads.back()->Start(); tasks.push_back(CreateTask(TaskShutdownBehavior::BLOCK_SHUTDOWN)); - post_threads.push_back(WrapUnique(new ThreadPostingAndRunningTask( + post_threads.push_back(MakeUnique( &tracker_, tasks.back().get(), - ThreadPostingAndRunningTask::Action::WILL_POST, true))); + ThreadPostingAndRunningTask::Action::WILL_POST, true)); post_threads.back()->Start(); } @@ -560,9 +560,9 @@ TEST_F(TaskSchedulerTaskTrackerTest, std::vector> run_threads; for (const auto& task : tasks) { - run_threads.push_back(WrapUnique(new ThreadPostingAndRunningTask( + run_threads.push_back(MakeUnique( &tracker_, task.get(), ThreadPostingAndRunningTask::Action::RUN, - false))); + false)); run_threads.back()->Start(); } @@ -591,21 +591,21 @@ TEST_F(TaskSchedulerTaskTrackerTest, LoadWillPostAndRunDuringShutdown) { for (size_t i = 0; i < kLoadTestNumIterations; ++i) { tasks.push_back(CreateTask(TaskShutdownBehavior::CONTINUE_ON_SHUTDOWN)); - threads.push_back(WrapUnique(new ThreadPostingAndRunningTask( + threads.push_back(MakeUnique( &tracker_, tasks.back().get(), - ThreadPostingAndRunningTask::Action::WILL_POST_AND_RUN, false))); + ThreadPostingAndRunningTask::Action::WILL_POST_AND_RUN, false)); threads.back()->Start(); tasks.push_back(CreateTask(TaskShutdownBehavior::SKIP_ON_SHUTDOWN)); - threads.push_back(WrapUnique(new ThreadPostingAndRunningTask( + threads.push_back(MakeUnique( &tracker_, tasks.back().get(), - ThreadPostingAndRunningTask::Action::WILL_POST_AND_RUN, false))); + ThreadPostingAndRunningTask::Action::WILL_POST_AND_RUN, false)); threads.back()->Start(); tasks.push_back(CreateTask(TaskShutdownBehavior::BLOCK_SHUTDOWN)); - threads.push_back(WrapUnique(new ThreadPostingAndRunningTask( + threads.push_back(MakeUnique( &tracker_, tasks.back().get(), - ThreadPostingAndRunningTask::Action::WILL_POST_AND_RUN, true))); + ThreadPostingAndRunningTask::Action::WILL_POST_AND_RUN, true)); threads.back()->Start(); } diff --git a/base/test/test_discardable_memory_allocator.cc b/base/test/test_discardable_memory_allocator.cc index cd96149aefdc4d..e4d361e8999fbb 100644 --- a/base/test/test_discardable_memory_allocator.cc +++ b/base/test/test_discardable_memory_allocator.cc @@ -61,7 +61,7 @@ TestDiscardableMemoryAllocator::~TestDiscardableMemoryAllocator() { std::unique_ptr TestDiscardableMemoryAllocator::AllocateLockedDiscardableMemory(size_t size) { - return WrapUnique(new DiscardableMemoryImpl(size)); + return MakeUnique(size); } } // namespace base diff --git a/base/test/test_mock_time_task_runner.cc b/base/test/test_mock_time_task_runner.cc index 7dca3a931d7f60..6dfecaf838ba8e 100644 --- a/base/test/test_mock_time_task_runner.cc +++ b/base/test/test_mock_time_task_runner.cc @@ -165,12 +165,12 @@ TimeTicks TestMockTimeTaskRunner::NowTicks() const { std::unique_ptr TestMockTimeTaskRunner::GetMockClock() const { DCHECK(thread_checker_.CalledOnValidThread()); - return WrapUnique(new MockClock(this)); + return MakeUnique(this); } std::unique_ptr TestMockTimeTaskRunner::GetMockTickClock() const { DCHECK(thread_checker_.CalledOnValidThread()); - return WrapUnique(new MockTickClock(this)); + return MakeUnique(this); } bool TestMockTimeTaskRunner::HasPendingTask() const { diff --git a/base/test/test_reg_util_win.cc b/base/test/test_reg_util_win.cc index f58b280bf1f236..8dda1b362ba78d 100644 --- a/base/test/test_reg_util_win.cc +++ b/base/test/test_reg_util_win.cc @@ -106,7 +106,7 @@ void RegistryOverrideManager::OverrideRegistry(HKEY override, base::string16* override_path) { base::string16 key_path = GenerateTempKeyPath(test_key_root_, timestamp_); overrides_.push_back( - base::WrapUnique(new ScopedRegistryKeyOverride(override, key_path))); + base::MakeUnique(override, key_path)); if (override_path) override_path->assign(key_path); } diff --git a/base/trace_event/memory_dump_manager.cc b/base/trace_event/memory_dump_manager.cc index 9a030f5e429935..9719a6c672086a 100644 --- a/base/trace_event/memory_dump_manager.cc +++ b/base/trace_event/memory_dump_manager.cc @@ -672,14 +672,14 @@ void MemoryDumpManager::OnTraceLogEnabled() { TRACE_EVENT_API_ADD_METADATA_EVENT( TraceLog::GetCategoryGroupEnabled("__metadata"), "stackFrames", "stackFrames", - WrapUnique(new SessionStateConvertableProxy( - session_state, &MemoryDumpSessionState::stack_frame_deduplicator))); + MakeUnique>( + session_state, &MemoryDumpSessionState::stack_frame_deduplicator)); TRACE_EVENT_API_ADD_METADATA_EVENT( TraceLog::GetCategoryGroupEnabled("__metadata"), "typeNames", "typeNames", - WrapUnique(new SessionStateConvertableProxy( - session_state, &MemoryDumpSessionState::type_name_deduplicator))); + MakeUnique>( + session_state, &MemoryDumpSessionState::type_name_deduplicator)); } { diff --git a/base/trace_event/process_memory_dump.cc b/base/trace_event/process_memory_dump.cc index 826989237bceb8..07142118d3e0e1 100644 --- a/base/trace_event/process_memory_dump.cc +++ b/base/trace_event/process_memory_dump.cc @@ -164,14 +164,14 @@ ProcessMemoryDump::~ProcessMemoryDump() {} MemoryAllocatorDump* ProcessMemoryDump::CreateAllocatorDump( const std::string& absolute_name) { return AddAllocatorDumpInternal( - WrapUnique(new MemoryAllocatorDump(absolute_name, this))); + MakeUnique(absolute_name, this)); } MemoryAllocatorDump* ProcessMemoryDump::CreateAllocatorDump( const std::string& absolute_name, const MemoryAllocatorDumpGuid& guid) { return AddAllocatorDumpInternal( - WrapUnique(new MemoryAllocatorDump(absolute_name, this, guid))); + MakeUnique(absolute_name, this, guid)); } MemoryAllocatorDump* ProcessMemoryDump::AddAllocatorDumpInternal( diff --git a/base/trace_event/trace_config.cc b/base/trace_event/trace_config.cc index ee2ebdf03f4a85..96c4dc7064657e 100644 --- a/base/trace_event/trace_config.cc +++ b/base/trace_event/trace_config.cc @@ -271,7 +271,7 @@ std::string TraceConfig::ToString() const { std::unique_ptr TraceConfig::AsConvertableToTraceFormat() const { - return WrapUnique(new ConvertableTraceConfigToTraceFormat(*this)); + return MakeUnique(*this); } std::string TraceConfig::ToCategoryFilterString() const { diff --git a/base/trace_event/trace_event_argument_unittest.cc b/base/trace_event/trace_event_argument_unittest.cc index 61395f4d5521ba..3e00f11899995f 100644 --- a/base/trace_event/trace_event_argument_unittest.cc +++ b/base/trace_event/trace_event_argument_unittest.cc @@ -131,10 +131,10 @@ TEST(TraceEventArgumentTest, PassBaseValue) { } TEST(TraceEventArgumentTest, PassTracedValue) { - auto dict_value = WrapUnique(new TracedValue()); + auto dict_value = MakeUnique(); dict_value->SetInteger("a", 1); - auto nested_dict_value = WrapUnique(new TracedValue()); + auto nested_dict_value = MakeUnique(); nested_dict_value->SetInteger("b", 2); nested_dict_value->BeginArray("c"); nested_dict_value->AppendString("foo"); diff --git a/base/values_unittest.cc b/base/values_unittest.cc index d68522234de55d..61e754e3d23f30 100644 --- a/base/values_unittest.cc +++ b/base/values_unittest.cc @@ -62,10 +62,10 @@ TEST(ValuesTest, Basic) { TEST(ValuesTest, List) { std::unique_ptr mixed_list(new ListValue()); - mixed_list->Set(0, WrapUnique(new FundamentalValue(true))); - mixed_list->Set(1, WrapUnique(new FundamentalValue(42))); - mixed_list->Set(2, WrapUnique(new FundamentalValue(88.8))); - mixed_list->Set(3, WrapUnique(new StringValue("foo"))); + mixed_list->Set(0, MakeUnique(true)); + mixed_list->Set(1, MakeUnique(42)); + mixed_list->Set(2, MakeUnique(88.8)); + mixed_list->Set(3, MakeUnique("foo")); ASSERT_EQ(4u, mixed_list->GetSize()); Value *value = NULL; @@ -200,14 +200,14 @@ TEST(ValuesTest, ListDeletion) { { ListValue list; - list.Append(WrapUnique(new DeletionTestValue(&deletion_flag))); + list.Append(MakeUnique(&deletion_flag)); EXPECT_FALSE(deletion_flag); } EXPECT_TRUE(deletion_flag); { ListValue list; - list.Append(WrapUnique(new DeletionTestValue(&deletion_flag))); + list.Append(MakeUnique(&deletion_flag)); EXPECT_FALSE(deletion_flag); list.Clear(); EXPECT_TRUE(deletion_flag); @@ -215,7 +215,7 @@ TEST(ValuesTest, ListDeletion) { { ListValue list; - list.Append(WrapUnique(new DeletionTestValue(&deletion_flag))); + list.Append(MakeUnique(&deletion_flag)); EXPECT_FALSE(deletion_flag); EXPECT_TRUE(list.Set(0, Value::CreateNullValue())); EXPECT_TRUE(deletion_flag); @@ -228,7 +228,7 @@ TEST(ValuesTest, ListRemoval) { { ListValue list; - list.Append(WrapUnique(new DeletionTestValue(&deletion_flag))); + list.Append(MakeUnique(&deletion_flag)); EXPECT_FALSE(deletion_flag); EXPECT_EQ(1U, list.GetSize()); EXPECT_FALSE(list.Remove(std::numeric_limits::max(), @@ -244,7 +244,7 @@ TEST(ValuesTest, ListRemoval) { { ListValue list; - list.Append(WrapUnique(new DeletionTestValue(&deletion_flag))); + list.Append(MakeUnique(&deletion_flag)); EXPECT_FALSE(deletion_flag); EXPECT_TRUE(list.Remove(0, NULL)); EXPECT_TRUE(deletion_flag); @@ -272,14 +272,14 @@ TEST(ValuesTest, DictionaryDeletion) { { DictionaryValue dict; - dict.Set(key, WrapUnique(new DeletionTestValue(&deletion_flag))); + dict.Set(key, MakeUnique(&deletion_flag)); EXPECT_FALSE(deletion_flag); } EXPECT_TRUE(deletion_flag); { DictionaryValue dict; - dict.Set(key, WrapUnique(new DeletionTestValue(&deletion_flag))); + dict.Set(key, MakeUnique(&deletion_flag)); EXPECT_FALSE(deletion_flag); dict.Clear(); EXPECT_TRUE(deletion_flag); @@ -287,7 +287,7 @@ TEST(ValuesTest, DictionaryDeletion) { { DictionaryValue dict; - dict.Set(key, WrapUnique(new DeletionTestValue(&deletion_flag))); + dict.Set(key, MakeUnique(&deletion_flag)); EXPECT_FALSE(deletion_flag); dict.Set(key, Value::CreateNullValue()); EXPECT_TRUE(deletion_flag); @@ -301,7 +301,7 @@ TEST(ValuesTest, DictionaryRemoval) { { DictionaryValue dict; - dict.Set(key, WrapUnique(new DeletionTestValue(&deletion_flag))); + dict.Set(key, MakeUnique(&deletion_flag)); EXPECT_FALSE(deletion_flag); EXPECT_TRUE(dict.HasKey(key)); EXPECT_FALSE(dict.Remove("absent key", &removed_item)); @@ -315,7 +315,7 @@ TEST(ValuesTest, DictionaryRemoval) { { DictionaryValue dict; - dict.Set(key, WrapUnique(new DeletionTestValue(&deletion_flag))); + dict.Set(key, MakeUnique(&deletion_flag)); EXPECT_FALSE(deletion_flag); EXPECT_TRUE(dict.HasKey(key)); EXPECT_TRUE(dict.Remove(key, NULL)); @@ -582,7 +582,7 @@ TEST(ValuesTest, Equals) { copy->Set("f", std::move(list_copy)); EXPECT_TRUE(dv.Equals(copy.get())); - original_list->Append(WrapUnique(new FundamentalValue(true))); + original_list->Append(MakeUnique(true)); EXPECT_FALSE(dv.Equals(copy.get())); // Check if Equals detects differences in only the keys. @@ -739,7 +739,7 @@ TEST(ValuesTest, RemoveEmptyChildren) { { std::unique_ptr inner(new ListValue); std::unique_ptr inner2(new ListValue); - inner2->Append(WrapUnique(new StringValue("hello"))); + inner2->Append(MakeUnique("hello")); inner->Append(WrapUnique(new DictionaryValue)); inner->Append(std::move(inner2)); root->Set("list_with_empty_children", std::move(inner));