Update from https://crrev.com/314320

cc/test/ordered_simple_task_runner.h

 // 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.
 
 #ifndef CC_TEST_ORDERED_SIMPLE_TASK_RUNNER_H_
 #define CC_TEST_ORDERED_SIMPLE_TASK_RUNNER_H_
 
 #include <limits>
 #include <set>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
-#include "base/debug/trace_event.h"
 #include "base/logging.h"
 #include "base/test/test_simple_task_runner.h"
+#include "base/trace_event/trace_event.h"
 #include "cc/test/test_now_source.h"
 
 namespace cc {
 
 // Subclass of TestPendingTask which has a unique ID for every task, supports
 // being used inside a std::set and has debug tracing support.
 class TestOrderablePendingTask : public base::TestPendingTask {
  public:
   TestOrderablePendingTask();
   TestOrderablePendingTask(const tracked_objects::Location& location,
@@ skipping 117 matching lines @@
   bool inside_run_tasks_until_;
   std::set<TestOrderablePendingTask> pending_tasks_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(OrderedSimpleTaskRunner);
 };
 
 }  // namespace cc
 
 #endif  // CC_TEST_ORDERED_SIMPLE_TASK_RUNNER_H_