Update from https://crrev.com/314320

cc/test/ordered_simple_task_runner.cc

 // Copyright 2014 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 "cc/test/ordered_simple_task_runner.h"
 
 #include <limits>
 #include <set>
 #include <sstream>
 #include <string>
 #include <vector>
 
 #include "base/auto_reset.h"
-#include "base/debug/trace_event.h"
-#include "base/debug/trace_event_argument.h"
 #include "base/strings/string_number_conversions.h"
+#include "base/trace_event/trace_event.h"
+#include "base/trace_event/trace_event_argument.h"
 
 #define TRACE_TASK(function, task) \
   TRACE_EVENT_INSTANT1(            \
       "cc", function, TRACE_EVENT_SCOPE_THREAD, "task", task.AsValue());
 
 #define TRACE_TASK_RUN(function, tag, task)
 
 namespace cc {
 
 // TestOrderablePendingTask implementation
@@ skipping 298 matching lines @@
 
 bool OrderedSimpleTaskRunner::AdvanceNowCallback() {
   base::TimeTicks next_task_time = NextTaskTime();
   if (now_src_->Now() < next_task_time) {
     now_src_->SetNow(next_task_time);
   }
   return true;
 }
 
 }  // namespace cc