Update from https://crrev.com/314320

cc/animation/animation.cc

 // Copyright 2012 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/animation/animation.h"
 
 #include <cmath>
 
-#include "base/debug/trace_event.h"
 #include "base/strings/string_util.h"
+#include "base/trace_event/trace_event.h"
 #include "cc/animation/animation_curve.h"
 #include "cc/base/time_util.h"
 
 namespace {
 
 // This should match the RunState enum.
 static const char* const s_runStateNames[] = {
   "WaitingForTargetAvailability",
   "WaitingForDeletion",
   "Starting",
@@ skipping 261 matching lines @@
   // the main thread.
   if (run_state_ == Animation::Paused ||
       other->run_state_ == Animation::Paused) {
     other->run_state_ = run_state_;
     other->pause_time_ = pause_time_;
     other->total_paused_time_ = total_paused_time_;
   }
 }
 
 }  // namespace cc