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

Side by Side Diff: base/task_scheduler/priority_queue_unittest.cc

Issue 2258713003: Re-write many calls to WrapUnique() with MakeUnique() (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 4 years, 3 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 unified diff | Download patch
OLDNEW
1 // Copyright 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "base/task_scheduler/priority_queue.h" 5 #include "base/task_scheduler/priority_queue.h"
6 6
7 #include <memory> 7 #include <memory>
8 8
9 #include "base/macros.h" 9 #include "base/macros.h"
10 #include "base/memory/ptr_util.h" 10 #include "base/memory/ptr_util.h"
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
51 WaitableEvent transaction_began_; 51 WaitableEvent transaction_began_;
52 52
53 DISALLOW_COPY_AND_ASSIGN(ThreadBeginningTransaction); 53 DISALLOW_COPY_AND_ASSIGN(ThreadBeginningTransaction);
54 }; 54 };
55 55
56 } // namespace 56 } // namespace
57 57
58 TEST(TaskSchedulerPriorityQueueTest, PushPopPeek) { 58 TEST(TaskSchedulerPriorityQueueTest, PushPopPeek) {
59 // Create test sequences. 59 // Create test sequences.
60 scoped_refptr<Sequence> sequence_a(new Sequence); 60 scoped_refptr<Sequence> sequence_a(new Sequence);
61 sequence_a->PushTask(WrapUnique(new Task( 61 sequence_a->PushTask(MakeUnique<Task>(
62 FROM_HERE, Closure(), 62 FROM_HERE, Closure(),
63 TaskTraits().WithPriority(TaskPriority::USER_VISIBLE), TimeDelta()))); 63 TaskTraits().WithPriority(TaskPriority::USER_VISIBLE), TimeDelta()));
64 SequenceSortKey sort_key_a = sequence_a->GetSortKey(); 64 SequenceSortKey sort_key_a = sequence_a->GetSortKey();
65 65
66 scoped_refptr<Sequence> sequence_b(new Sequence); 66 scoped_refptr<Sequence> sequence_b(new Sequence);
67 sequence_b->PushTask(WrapUnique(new Task( 67 sequence_b->PushTask(MakeUnique<Task>(
68 FROM_HERE, Closure(), 68 FROM_HERE, Closure(),
69 TaskTraits().WithPriority(TaskPriority::USER_BLOCKING), TimeDelta()))); 69 TaskTraits().WithPriority(TaskPriority::USER_BLOCKING), TimeDelta()));
70 SequenceSortKey sort_key_b = sequence_b->GetSortKey(); 70 SequenceSortKey sort_key_b = sequence_b->GetSortKey();
71 71
72 scoped_refptr<Sequence> sequence_c(new Sequence); 72 scoped_refptr<Sequence> sequence_c(new Sequence);
73 sequence_c->PushTask(WrapUnique(new Task( 73 sequence_c->PushTask(MakeUnique<Task>(
74 FROM_HERE, Closure(), 74 FROM_HERE, Closure(),
75 TaskTraits().WithPriority(TaskPriority::USER_BLOCKING), TimeDelta()))); 75 TaskTraits().WithPriority(TaskPriority::USER_BLOCKING), TimeDelta()));
76 SequenceSortKey sort_key_c = sequence_c->GetSortKey(); 76 SequenceSortKey sort_key_c = sequence_c->GetSortKey();
77 77
78 scoped_refptr<Sequence> sequence_d(new Sequence); 78 scoped_refptr<Sequence> sequence_d(new Sequence);
79 sequence_d->PushTask(WrapUnique(new Task( 79 sequence_d->PushTask(MakeUnique<Task>(
80 FROM_HERE, Closure(), TaskTraits().WithPriority(TaskPriority::BACKGROUND), 80 FROM_HERE, Closure(), TaskTraits().WithPriority(TaskPriority::BACKGROUND),
81 TimeDelta()))); 81 TimeDelta()));
82 SequenceSortKey sort_key_d = sequence_d->GetSortKey(); 82 SequenceSortKey sort_key_d = sequence_d->GetSortKey();
83 83
84 // Create a PriorityQueue and a Transaction. 84 // Create a PriorityQueue and a Transaction.
85 PriorityQueue pq; 85 PriorityQueue pq;
86 auto transaction(pq.BeginTransaction()); 86 auto transaction(pq.BeginTransaction());
87 EXPECT_TRUE(transaction->IsEmpty()); 87 EXPECT_TRUE(transaction->IsEmpty());
88 88
89 // Push |sequence_a| in the PriorityQueue. It becomes the sequence with the 89 // Push |sequence_a| in the PriorityQueue. It becomes the sequence with the
90 // highest priority. 90 // highest priority.
91 transaction->Push(sequence_a, sort_key_a); 91 transaction->Push(sequence_a, sort_key_a);
(...skipping 83 matching lines...) Expand 10 before | Expand all | Expand 10 after
175 175
176 // End the Transaction on the current thread. 176 // End the Transaction on the current thread.
177 transaction.reset(); 177 transaction.reset();
178 178
179 // The other thread should exit after its call to BeginTransaction() returns. 179 // The other thread should exit after its call to BeginTransaction() returns.
180 thread_beginning_transaction.Join(); 180 thread_beginning_transaction.Join();
181 } 181 }
182 182
183 } // namespace internal 183 } // namespace internal
184 } // namespace base 184 } // namespace base
OLDNEW
« no previous file with comments | « base/metrics/persistent_sample_map_unittest.cc ('k') | base/task_scheduler/scheduler_service_thread.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698