CC Animation: Move LayerTreeMutator from cc/animation to cc/trees.

CC shnoudn't inlude headers from cc/animation.

BUG=575043
CQ_INCLUDE_TRYBOTS=master.tryserver.blink:linux_trusty_blink_rel

Review-Url: https://codereview.chromium.org/2492743002
Cr-Commit-Position: refs/heads/master@{#431393}

diff --git a/cc/BUILD.gn b/cc/BUILD.gn
index 36e94cd..13b00ff 100644
--- a/cc/BUILD.gn
+++ b/cc/BUILD.gn

@@ -532,6 +532,7 @@
     "trees/layer_tree_host_single_thread_client.h",
     "trees/layer_tree_impl.cc",
     "trees/layer_tree_impl.h",
+    "trees/layer_tree_mutator.h",
     "trees/layer_tree_settings.cc",
     "trees/layer_tree_settings.h",
     "trees/mutator_host.h",

diff --git a/cc/test/fake_proxy.cc b/cc/test/fake_proxy.cc
index 4c337027..7b06d9a5 100644
--- a/cc/test/fake_proxy.cc
+++ b/cc/test/fake_proxy.cc

@@ -4,7 +4,7 @@
 
 #include "cc/test/fake_proxy.h"
 
-#include "cc/animation/layer_tree_mutator.h"
+#include "cc/trees/layer_tree_mutator.h"
 
 namespace cc {
 

diff --git a/cc/trees/layer_tree_host_impl.h b/cc/trees/layer_tree_host_impl.h
index 78edbfa6..5081ac2 100644
--- a/cc/trees/layer_tree_host_impl.h
+++ b/cc/trees/layer_tree_host_impl.h

@@ -17,7 +17,6 @@
 #include "base/callback.h"
 #include "base/macros.h"
 #include "base/time/time.h"
-#include "cc/animation/layer_tree_mutator.h"
 #include "cc/base/cc_export.h"
 #include "cc/base/synced_property.h"
 #include "cc/debug/micro_benchmark_controller_impl.h"
@@ -39,6 +38,7 @@
 #include "cc/scheduler/video_frame_controller.h"
 #include "cc/tiles/image_decode_controller.h"
 #include "cc/tiles/tile_manager.h"
+#include "cc/trees/layer_tree_mutator.h"
 #include "cc/trees/layer_tree_settings.h"
 #include "cc/trees/mutator_host_client.h"
 #include "cc/trees/task_runner_provider.h"

diff --git a/cc/animation/layer_tree_mutator.h b/cc/trees/layer_tree_mutator.h
similarity index 88%
rename from cc/animation/layer_tree_mutator.h
rename to cc/trees/layer_tree_mutator.h
index ef2f9ba..9233ca2 100644
--- a/cc/animation/layer_tree_mutator.h
+++ b/cc/trees/layer_tree_mutator.h

@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CC_ANIMATION_LAYER_TREE_MUTATOR_H_
-#define CC_ANIMATION_LAYER_TREE_MUTATOR_H_
+#ifndef CC_TREES_LAYER_TREE_MUTATOR_H_
+#define CC_TREES_LAYER_TREE_MUTATOR_H_
 
 #include "base/callback_forward.h"
 #include "base/time/time.h"
@@ -37,4 +37,4 @@
 
 }  // namespace cc
 
-#endif  // CC_ANIMATION_LAYER_TREE_MUTATOR_H_
+#endif  // CC_TREES_LAYER_TREE_MUTATOR_H_

diff --git a/cc/trees/threaded_channel.cc b/cc/trees/threaded_channel.cc
index a92e22a..05bf230 100644
--- a/cc/trees/threaded_channel.cc
+++ b/cc/trees/threaded_channel.cc

@@ -9,8 +9,8 @@
 #include "base/memory/ptr_util.h"
 #include "base/single_thread_task_runner.h"
 #include "base/trace_event/trace_event.h"
-#include "cc/animation/layer_tree_mutator.h"
 #include "cc/trees/layer_tree_host.h"
+#include "cc/trees/layer_tree_mutator.h"
 #include "cc/trees/mutator_host.h"
 
 namespace cc {

diff --git a/content/renderer/gpu/render_widget_compositor.cc b/content/renderer/gpu/render_widget_compositor.cc
index 1a0d790..3b16e36 100644
--- a/content/renderer/gpu/render_widget_compositor.cc
+++ b/content/renderer/gpu/render_widget_compositor.cc

@@ -23,7 +23,6 @@
 #include "build/build_config.h"
 #include "cc/animation/animation_host.h"
 #include "cc/animation/animation_timeline.h"
-#include "cc/animation/layer_tree_mutator.h"
 #include "cc/base/switches.h"
 #include "cc/blimp/engine_picture_cache.h"
 #include "cc/blimp/image_serialization_processor.h"
@@ -44,6 +43,7 @@
 #include "cc/scheduler/begin_frame_source.h"
 #include "cc/trees/latency_info_swap_promise_monitor.h"
 #include "cc/trees/layer_tree_host_in_process.h"
+#include "cc/trees/layer_tree_mutator.h"
 #include "cc/trees/remote_proto_channel.h"
 #include "content/common/content_switches_internal.h"
 #include "content/common/gpu/client/context_provider_command_buffer.h"

diff --git a/third_party/WebKit/public/platform/WebCompositorMutatorClient.h b/third_party/WebKit/public/platform/WebCompositorMutatorClient.h
index 29ab27b..112e6d7 100644
--- a/third_party/WebKit/public/platform/WebCompositorMutatorClient.h
+++ b/third_party/WebKit/public/platform/WebCompositorMutatorClient.h

@@ -6,7 +6,8 @@
 #define WebCompositorMutatorClient_h
 
 #include "WebCommon.h"
-#include "cc/animation/layer_tree_mutator.h"
+
+#include "cc/trees/layer_tree_mutator.h"
 
 namespace blink {