Use constexpr TaskTraits constructor in base (part 2).

base/task_scheduler/priority_queue_unittest.cc

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/task_scheduler/priority_queue.h"
 
 #include <memory>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
@@ skipping 42 matching lines @@
   WaitableEvent transaction_began_;
 
   DISALLOW_COPY_AND_ASSIGN(ThreadBeginningTransaction);
 };
 
 }  // namespace
 
 TEST(TaskSchedulerPriorityQueueTest, PushPopPeek) {
   // Create test sequences.
   scoped_refptr<Sequence> sequence_a(new Sequence);
-  sequence_a->PushTask(MakeUnique<Task>(
-      FROM_HERE, Bind(&DoNothing),
-      TaskTraits().WithPriority(TaskPriority::USER_VISIBLE), TimeDelta()));
+  sequence_a->PushTask(MakeUnique<Task>(FROM_HERE, Bind(&DoNothing),
+                                        TaskTraits(TaskPriority::USER_VISIBLE),
+                                        TimeDelta()));
   SequenceSortKey sort_key_a = sequence_a->GetSortKey();
 
   scoped_refptr<Sequence> sequence_b(new Sequence);
-  sequence_b->PushTask(MakeUnique<Task>(
-      FROM_HERE, Bind(&DoNothing),
-      TaskTraits().WithPriority(TaskPriority::USER_BLOCKING), TimeDelta()));
+  sequence_b->PushTask(MakeUnique<Task>(FROM_HERE, Bind(&DoNothing),
+                                        TaskTraits(TaskPriority::USER_BLOCKING),
+                                        TimeDelta()));
   SequenceSortKey sort_key_b = sequence_b->GetSortKey();
 
   scoped_refptr<Sequence> sequence_c(new Sequence);
-  sequence_c->PushTask(MakeUnique<Task>(
-      FROM_HERE, Bind(&DoNothing),
-      TaskTraits().WithPriority(TaskPriority::USER_BLOCKING), TimeDelta()));
+  sequence_c->PushTask(MakeUnique<Task>(FROM_HERE, Bind(&DoNothing),
+                                        TaskTraits(TaskPriority::USER_BLOCKING),
+                                        TimeDelta()));
   SequenceSortKey sort_key_c = sequence_c->GetSortKey();
 
   scoped_refptr<Sequence> sequence_d(new Sequence);
-  sequence_d->PushTask(MakeUnique<Task>(
-      FROM_HERE, Bind(&DoNothing),
-      TaskTraits().WithPriority(TaskPriority::BACKGROUND), TimeDelta()));
+  sequence_d->PushTask(MakeUnique<Task>(FROM_HERE, Bind(&DoNothing),
+                                        TaskTraits(TaskPriority::BACKGROUND),
+                                        TimeDelta()));
   SequenceSortKey sort_key_d = sequence_d->GetSortKey();
 
   // Create a PriorityQueue and a Transaction.
   PriorityQueue pq;
   auto transaction(pq.BeginTransaction());
   EXPECT_TRUE(transaction->IsEmpty());
 
   // Push |sequence_a| in the PriorityQueue. It becomes the sequence with the
   // highest priority.
   transaction->Push(sequence_a, sort_key_a);
@@ skipping 70 matching lines @@
 
   // End the Transaction on the current thread.
   transaction.reset();
 
   // The other thread should exit after its call to BeginTransaction() returns.
   thread_beginning_transaction.Join();
 }
 
 }  // namespace internal
 }  // namespace base