CC Animation: Merge LayerAnimationController into ElementAnimations.

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/memory/ptr_util.h"
 #include "base/strings/string_util.h"
@@ skipping 90 matching lines @@
   if (is_controlling_instance_ && !was_finished && is_finished())
     TRACE_EVENT_ASYNC_END0("cc", "Animation", this);
 
   char state_buffer[256];
   base::snprintf(state_buffer,
                  sizeof(state_buffer),
                  "%s->%s",
                  old_run_state_name,
                  new_run_state_name);
 
-  TRACE_EVENT_INSTANT2("cc",
-                       "LayerAnimationController::SetRunState",
-                       TRACE_EVENT_SCOPE_THREAD,
-                       "Name",
-                       TRACE_STR_COPY(name_buffer),
-                       "State",
-                       TRACE_STR_COPY(state_buffer));
+  TRACE_EVENT_INSTANT2(
+      "cc", "ElementAnimations::SetRunState", TRACE_EVENT_SCOPE_THREAD, "Name",
+      TRACE_STR_COPY(name_buffer), "State", TRACE_STR_COPY(state_buffer));
 }
 
 void Animation::Suspend(base::TimeTicks monotonic_time) {
   SetRunState(PAUSED, monotonic_time);
   suspended_ = true;
 }
 
 void Animation::Resume(base::TimeTicks monotonic_time) {
   suspended_ = false;
   SetRunState(RUNNING, monotonic_time);
@@ skipping 136 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