ui: Move compositor/ directory out of gfx/, up to ui/.

ui/compositor/scoped_layer_animation_settings.h

Index: ui/compositor/scoped_layer_animation_settings.h
diff --git a/ui/gfx/compositor/scoped_layer_animation_settings.h b/ui/compositor/scoped_layer_animation_settings.h
similarity index 83%
rename from ui/gfx/compositor/scoped_layer_animation_settings.h
rename to ui/compositor/scoped_layer_animation_settings.h
index 61c2b37246b0b5de63c7dcbf97afa735fa937bb2..5ca44224baed5f1a9d5f8f66bbd94bf129746487 100644
--- a/ui/gfx/compositor/scoped_layer_animation_settings.h
+++ b/ui/compositor/scoped_layer_animation_settings.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 UI_GFX_COMPOSITOR_SCOPED_LAYER_ANIMATION_SETTINGS_H_
-#define UI_GFX_COMPOSITOR_SCOPED_LAYER_ANIMATION_SETTINGS_H_
+#ifndef UI_COMPOSITOR_SCOPED_LAYER_ANIMATION_SETTINGS_H_
+#define UI_COMPOSITOR_SCOPED_LAYER_ANIMATION_SETTINGS_H_
 #pragma once
 
 #include <set>
@@ -11,8 +11,8 @@
 #include "base/time.h"
 
 #include "ui/base/animation/tween.h"
-#include "ui/gfx/compositor/compositor_export.h"
-#include "ui/gfx/compositor/layer_animator.h"
+#include "ui/compositor/compositor_export.h"
+#include "ui/compositor/layer_animator.h"
 
 namespace ui {
 
@@ -51,4 +51,4 @@ class COMPOSITOR_EXPORT ScopedLayerAnimationSettings {
 
 }  // namespace ui
 
-#endif  // UI_GFX_COMPOSITOR_SCOPED_LAYER_ANIMATION_SETTINGS_H_
+#endif  // UI_COMPOSITOR_SCOPED_LAYER_ANIMATION_SETTINGS_H_