Part 9 of cc/ directory shuffles: scheduler

Continuation of https://src.chromium.org/viewvc/chrome?view=rev&revision=188681

BUG=190824
TBR=enne@chromium.org

Review URL: https://codereview.chromium.org/12471008

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@188697 0039d316-1c4b-4281-b951-d872f2087c98

34 files changed, 86 insertions, 86 deletions

diff --git a/cc/cc.gyp b/cc/cc.gyp
index eba90fb..3a8c6cb 100644
--- a/cc/cc.gyp
+++ b/cc/cc.gyp
@@ -46,8 +46,8 @@
       'debug/debug_colors.h',
       'debug/debug_rect_history.cc',
       'debug/debug_rect_history.h',
-      'delay_based_time_source.cc',
-      'delay_based_time_source.h',
+      'scheduler/delay_based_time_source.cc',
+      'scheduler/delay_based_time_source.h',
       'output/delegated_frame_data.h',
       'output/delegated_frame_data.cc',
       'delegated_renderer_layer.cc',
@@ -64,8 +64,8 @@
       'quads/draw_quad.h',
       'debug/fake_web_graphics_context_3d.cc',
       'debug/fake_web_graphics_context_3d.h',
-      'frame_rate_controller.cc',
-      'frame_rate_controller.h',
+      'scheduler/frame_rate_controller.cc',
+      'scheduler/frame_rate_controller.h',
       'debug/frame_rate_counter.cc',
       'debug/frame_rate_counter.h',
       'output/geometry_binding.cc',
@@ -192,8 +192,8 @@
       'quad_sink.h',
       'resources/raster_worker_pool.cc',
       'resources/raster_worker_pool.h',
-      'rate_limiter.cc',
-      'rate_limiter.h',
+      'scheduler/rate_limiter.cc',
+      'scheduler/rate_limiter.h',
       'base/region.cc',
       'base/region.h',
       'quads/render_pass.cc',
@@ -224,12 +224,12 @@
       'resources/resource_update_queue.cc',
       'resources/resource_update_queue.h',
       'debug/ring_buffer.h',
-      'scheduler.cc',
-      'scheduler.h',
-      'scheduler_settings.cc',
-      'scheduler_settings.h',
-      'scheduler_state_machine.cc',
-      'scheduler_state_machine.h',
+      'scheduler/scheduler.cc',
+      'scheduler/scheduler.h',
+      'scheduler/scheduler_settings.cc',
+      'scheduler/scheduler_settings.h',
+      'scheduler/scheduler_state_machine.cc',
+      'scheduler/scheduler_state_machine.h',
       'base/scoped_ptr_algorithm.h',
       'base/scoped_ptr_deque.h',
       'base/scoped_ptr_hash_map.h',
@@ -283,8 +283,8 @@
       'texture_layer_impl.h',
       'resources/texture_mailbox.cc',
       'resources/texture_mailbox.h',
-      'texture_uploader.cc',
-      'texture_uploader.h',
+      'scheduler/texture_uploader.cc',
+      'scheduler/texture_uploader.h',
       'base/thread.h',
       'base/thread_impl.cc',
       'base/thread_impl.h',
@@ -304,7 +304,7 @@
       'tiled_layer_impl.h',
       'base/tiling_data.cc',
       'base/tiling_data.h',
-      'time_source.h',
+      'scheduler/time_source.h',
       'timing_function.cc',
       'timing_function.h',
       'input/top_controls_manager.cc',
@@ -326,8 +326,8 @@
       'video_layer.h',
       'video_layer_impl.cc',
       'video_layer_impl.h',
-      'vsync_time_source.cc',
-      'vsync_time_source.h',
+      'scheduler/vsync_time_source.cc',
+      'scheduler/vsync_time_source.h',
       'base/worker_pool.cc',
       'base/worker_pool.h',
       'quads/yuv_video_draw_quad.cc',
diff --git a/cc/cc_tests.gyp b/cc/cc_tests.gyp
index 07bcb78..2ce29db 100644
--- a/cc/cc_tests.gyp
+++ b/cc/cc_tests.gyp
@@ -10,12 +10,12 @@
       'content_layer_unittest.cc',
       'contents_scaling_layer_unittest.cc',
       'trees/damage_tracker_unittest.cc',
-      'delay_based_time_source_unittest.cc',
+      'scheduler/delay_based_time_source_unittest.cc',
       'delegated_renderer_layer_impl_unittest.cc',
       'output/delegating_renderer_unittest.cc',
       'quads/draw_quad_unittest.cc',
       'base/float_quad_unittest.cc',
-      'frame_rate_controller_unittest.cc',
+      'scheduler/frame_rate_controller_unittest.cc',
       'output/gl_renderer_unittest.cc',
       'output/gl_renderer_pixeltest.cc',
       'base/hash_pair_unittest.cc',
@@ -51,8 +51,8 @@
       'render_surface_unittest.cc',
       'resources/resource_provider_unittest.cc',
       'resources/resource_update_controller_unittest.cc',
-      'scheduler_state_machine_unittest.cc',
-      'scheduler_unittest.cc',
+      'scheduler/scheduler_state_machine_unittest.cc',
+      'scheduler/scheduler_unittest.cc',
       'resources/scoped_resource_unittest.cc',
       'animation/scrollbar_animation_controller_linear_fade_unittest.cc',
       'scrollbar_layer_unittest.cc',
@@ -60,7 +60,7 @@
       'solid_color_layer_impl_unittest.cc',
       'output/texture_copier_unittest.cc',
       'texture_layer_unittest.cc',
-      'texture_uploader_unittest.cc',
+      'scheduler/texture_uploader_unittest.cc',
       'resources/tile_priority_unittest.cc',
       'tiled_layer_impl_unittest.cc',
       'tiled_layer_unittest.cc',
@@ -70,7 +70,7 @@
       'trees/tree_synchronizer_unittest.cc',
       'timing_function_unittest.cc',
       'test/fake_web_graphics_context_3d_unittest.cc',
-      'vsync_time_source_unittest.cc',
+      'scheduler/vsync_time_source_unittest.cc',
     ],
     'cc_tests_support_files': [
       'test/animation_test_common.cc',
diff --git a/cc/nine_patch_layer_unittest.cc b/cc/nine_patch_layer_unittest.cc
index a090e2f..50e83e6 100644
--- a/cc/nine_patch_layer_unittest.cc
+++ b/cc/nine_patch_layer_unittest.cc
@@ -8,11 +8,11 @@
 #include "cc/resources/prioritized_resource_manager.h"
 #include "cc/resources/resource_provider.h"
 #include "cc/resources/resource_update_queue.h"
+#include "cc/scheduler/texture_uploader.h"
 #include "cc/test/fake_layer_tree_host_client.h"
 #include "cc/test/fake_output_surface.h"
 #include "cc/test/geometry_test_utils.h"
 #include "cc/test/layer_tree_test_common.h"
-#include "cc/texture_uploader.h"
 #include "cc/trees/layer_tree_host.h"
 #include "cc/trees/occlusion_tracker.h"
 #include "cc/trees/single_thread_proxy.h"
diff --git a/cc/resources/resource_provider.cc b/cc/resources/resource_provider.cc
index 27a9c8e..d987251 100644
--- a/cc/resources/resource_provider.cc
+++ b/cc/resources/resource_provider.cc
@@ -14,7 +14,7 @@
 #include "cc/output/gl_renderer.h"  // For the GLC() macro.
 #include "cc/resources/platform_color.h"
 #include "cc/resources/transferable_resource.h"
-#include "cc/texture_uploader.h"
+#include "cc/scheduler/texture_uploader.h"
 #include "gpu/GLES2/gl2extchromium.h"
 #include "third_party/WebKit/Source/Platform/chromium/public/WebGraphicsContext3D.h"
 #include "third_party/khronos/GLES2/gl2.h"
diff --git a/cc/delay_based_time_source.cc b/cc/scheduler/delay_based_time_source.cc
index db42105..f7fb1b7 100644
--- a/cc/delay_based_time_source.cc
+++ b/cc/scheduler/delay_based_time_source.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "cc/delay_based_time_source.h"
+#include "cc/scheduler/delay_based_time_source.h"
 
 #include <algorithm>
 #include <cmath>
diff --git a/cc/delay_based_time_source.h b/cc/scheduler/delay_based_time_source.h
index 101fc9f..d2e2a78 100644
--- a/cc/delay_based_time_source.h
+++ b/cc/scheduler/delay_based_time_source.h
@@ -2,12 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CC_DELAY_BASED_TIME_SOURCE_H_
-#define CC_DELAY_BASED_TIME_SOURCE_H_
+#ifndef CC_SCHEDULER_DELAY_BASED_TIME_SOURCE_H_
+#define CC_SCHEDULER_DELAY_BASED_TIME_SOURCE_H_
 
 #include "base/memory/weak_ptr.h"
 #include "cc/base/cc_export.h"
-#include "cc/time_source.h"
+#include "cc/scheduler/time_source.h"
 
 namespace cc {
 
@@ -78,4 +78,4 @@ protected:
 
 }  // namespace cc
 
-#endif  // CC_DELAY_BASED_TIME_SOURCE_H_
+#endif  // CC_SCHEDULER_DELAY_BASED_TIME_SOURCE_H_
diff --git a/cc/delay_based_time_source_unittest.cc b/cc/scheduler/delay_based_time_source_unittest.cc
index 008d37e..de4e11e 100644
--- a/cc/delay_based_time_source_unittest.cc
+++ b/cc/scheduler/delay_based_time_source_unittest.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "cc/delay_based_time_source.h"
+#include "cc/scheduler/delay_based_time_source.h"
 
 #include "cc/base/thread.h"
 #include "cc/test/scheduler_test_common.h"
diff --git a/cc/frame_rate_controller.cc b/cc/scheduler/frame_rate_controller.cc
index 217e545..de7b26a 100644
--- a/cc/frame_rate_controller.cc
+++ b/cc/scheduler/frame_rate_controller.cc
@@ -2,13 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "cc/frame_rate_controller.h"
+#include "cc/scheduler/frame_rate_controller.h"
 
 #include "base/debug/trace_event.h"
 #include "base/logging.h"
 #include "cc/base/thread.h"
-#include "cc/delay_based_time_source.h"
-#include "cc/time_source.h"
+#include "cc/scheduler/delay_based_time_source.h"
+#include "cc/scheduler/time_source.h"
 
 namespace cc {
 
diff --git a/cc/frame_rate_controller.h b/cc/scheduler/frame_rate_controller.h
index 508577a..46fa592 100644
--- a/cc/frame_rate_controller.h
+++ b/cc/scheduler/frame_rate_controller.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_FRAME_RATE_CONTROLLER_H_
-#define CC_FRAME_RATE_CONTROLLER_H_
+#ifndef CC_SCHEDULER_FRAME_RATE_CONTROLLER_H_
+#define CC_SCHEDULER_FRAME_RATE_CONTROLLER_H_
 
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
@@ -88,4 +88,4 @@ protected:
 
 }  // namespace cc
 
-#endif  // CC_FRAME_RATE_CONTROLLER_H_
+#endif  // CC_SCHEDULER_FRAME_RATE_CONTROLLER_H_
diff --git a/cc/frame_rate_controller_unittest.cc b/cc/scheduler/frame_rate_controller_unittest.cc
index d150248..4eb7e60 100644
--- a/cc/frame_rate_controller_unittest.cc
+++ b/cc/scheduler/frame_rate_controller_unittest.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "cc/frame_rate_controller.h"
+#include "cc/scheduler/frame_rate_controller.h"
 
 #include "cc/test/scheduler_test_common.h"
 #include "testing/gtest/include/gtest/gtest.h"
diff --git a/cc/rate_limiter.cc b/cc/scheduler/rate_limiter.cc
index 5c9e04e..df11acd 100644
--- a/cc/rate_limiter.cc
+++ b/cc/scheduler/rate_limiter.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "cc/rate_limiter.h"
+#include "cc/scheduler/rate_limiter.h"
 
 #include "base/debug/trace_event.h"
 #include "cc/base/thread.h"
diff --git a/cc/rate_limiter.h b/cc/scheduler/rate_limiter.h
index f2950bb..522528f 100644
--- a/cc/rate_limiter.h
+++ b/cc/scheduler/rate_limiter.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_RATE_LIMITER_H_
-#define CC_RATE_LIMITER_H_
+#ifndef CC_SCHEDULER_RATE_LIMITER_H_
+#define CC_SCHEDULER_RATE_LIMITER_H_
 
 #include "base/memory/ref_counted.h"
 
@@ -54,4 +54,4 @@ class RateLimiter : public base::RefCounted<RateLimiter> {
 };
 
 }
-#endif  // CC_RATE_LIMITER_H_
+#endif  // CC_SCHEDULER_RATE_LIMITER_H_
diff --git a/cc/scheduler.cc b/cc/scheduler/scheduler.cc
index a63fdd4..6a6f1f2 100644
--- a/cc/scheduler.cc
+++ b/cc/scheduler/scheduler.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "cc/scheduler.h"
+#include "cc/scheduler/scheduler.h"
 
 #include "base/auto_reset.h"
 #include "base/debug/trace_event.h"
diff --git a/cc/scheduler.h b/cc/scheduler/scheduler.h
index 4d39958..c91f604 100644
--- a/cc/scheduler.h
+++ b/cc/scheduler/scheduler.h
@@ -2,16 +2,16 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CC_SCHEDULER_H_
-#define CC_SCHEDULER_H_
+#ifndef CC_SCHEDULER_SCHEDULER_H_
+#define CC_SCHEDULER_SCHEDULER_H_
 
 #include "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/time.h"
 #include "cc/base/cc_export.h"
-#include "cc/frame_rate_controller.h"
-#include "cc/scheduler_settings.h"
-#include "cc/scheduler_state_machine.h"
+#include "cc/scheduler/frame_rate_controller.h"
+#include "cc/scheduler/scheduler_settings.h"
+#include "cc/scheduler/scheduler_state_machine.h"
 #include "cc/trees/layer_tree_host.h"
 
 namespace cc {
@@ -124,4 +124,4 @@ class CC_EXPORT Scheduler : FrameRateControllerClient {
 
 }  // namespace cc
 
-#endif  // CC_SCHEDULER_H_
+#endif  // CC_SCHEDULER_SCHEDULER_H_
diff --git a/cc/scheduler_settings.cc b/cc/scheduler/scheduler_settings.cc
index b124f80..7c37276 100644
--- a/cc/scheduler_settings.cc
+++ b/cc/scheduler/scheduler_settings.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "cc/scheduler_settings.h"
+#include "cc/scheduler/scheduler_settings.h"
 
 namespace cc {
 
diff --git a/cc/scheduler_settings.h b/cc/scheduler/scheduler_settings.h
index 8670309..d96b5a6 100644
--- a/cc/scheduler_settings.h
+++ b/cc/scheduler/scheduler_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 CC_SCHEDULER_SETTINGS_H_
-#define CC_SCHEDULER_SETTINGS_H_
+#ifndef CC_SCHEDULER_SCHEDULER_SETTINGS_H_
+#define CC_SCHEDULER_SCHEDULER_SETTINGS_H_
 
 #include "cc/base/cc_export.h"
 
@@ -19,4 +19,4 @@ class CC_EXPORT SchedulerSettings {
 
 }  // namespace cc
 
-#endif  // CC_SCHEDULER_SETTINGS_H_
+#endif  // CC_SCHEDULER_SCHEDULER_SETTINGS_H_
diff --git a/cc/scheduler_state_machine.cc b/cc/scheduler/scheduler_state_machine.cc
index e69bafc..ce2742b 100644
--- a/cc/scheduler_state_machine.cc
+++ b/cc/scheduler/scheduler_state_machine.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "cc/scheduler_state_machine.h"
+#include "cc/scheduler/scheduler_state_machine.h"
 
 #include "base/logging.h"
 #include "base/stringprintf.h"
diff --git a/cc/scheduler_state_machine.h b/cc/scheduler/scheduler_state_machine.h
index ce9395f..8471acc 100644
--- a/cc/scheduler_state_machine.h
+++ b/cc/scheduler/scheduler_state_machine.h
@@ -2,14 +2,14 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CC_SCHEDULER_STATE_MACHINE_H_
-#define CC_SCHEDULER_STATE_MACHINE_H_
+#ifndef CC_SCHEDULER_SCHEDULER_STATE_MACHINE_H_
+#define CC_SCHEDULER_SCHEDULER_STATE_MACHINE_H_
 
 #include <string>
 
 #include "base/basictypes.h"
 #include "cc/base/cc_export.h"
-#include "cc/scheduler_settings.h"
+#include "cc/scheduler/scheduler_settings.h"
 
 namespace cc {
 
@@ -190,4 +190,4 @@ class CC_EXPORT SchedulerStateMachine {
 
 }  // namespace cc
 
-#endif  // CC_SCHEDULER_STATE_MACHINE_H_
+#endif  // CC_SCHEDULER_SCHEDULER_STATE_MACHINE_H_
diff --git a/cc/scheduler_state_machine_unittest.cc b/cc/scheduler/scheduler_state_machine_unittest.cc
index 291f2ef..cc26509 100644
--- a/cc/scheduler_state_machine_unittest.cc
+++ b/cc/scheduler/scheduler_state_machine_unittest.cc
@@ -2,9 +2,9 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "cc/scheduler_state_machine.h"
+#include "cc/scheduler/scheduler_state_machine.h"
 
-#include "cc/scheduler.h"
+#include "cc/scheduler/scheduler.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace cc {
diff --git a/cc/scheduler_unittest.cc b/cc/scheduler/scheduler_unittest.cc
index 00d4e4e..689343e 100644
--- a/cc/scheduler_unittest.cc
+++ b/cc/scheduler/scheduler_unittest.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "cc/scheduler.h"
+#include "cc/scheduler/scheduler.h"
 
 #include "base/logging.h"
 #include "cc/test/scheduler_test_common.h"
diff --git a/cc/texture_uploader.cc b/cc/scheduler/texture_uploader.cc
index 0adf734..b5d3422 100644
--- a/cc/texture_uploader.cc
+++ b/cc/scheduler/texture_uploader.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "cc/texture_uploader.h"
+#include "cc/scheduler/texture_uploader.h"
 
 #include <algorithm>
 #include <vector>
diff --git a/cc/texture_uploader.h b/cc/scheduler/texture_uploader.h
index 5d0bf2b..46120c9 100644
--- a/cc/texture_uploader.h
+++ b/cc/scheduler/texture_uploader.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_TEXTURE_UPLOADER_H_
-#define CC_TEXTURE_UPLOADER_H_
+#ifndef CC_SCHEDULER_TEXTURE_UPLOADER_H_
+#define CC_SCHEDULER_TEXTURE_UPLOADER_H_
 
 #include <set>
 
@@ -122,4 +122,4 @@ class CC_EXPORT TextureUploader {
 
 }  // namespace cc
 
-#endif  // CC_TEXTURE_UPLOADER_H_
+#endif  // CC_SCHEDULER_TEXTURE_UPLOADER_H_
diff --git a/cc/texture_uploader_unittest.cc b/cc/scheduler/texture_uploader_unittest.cc
index 04d322f..6c5c916 100644
--- a/cc/texture_uploader_unittest.cc
+++ b/cc/scheduler/texture_uploader_unittest.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "cc/texture_uploader.h"
+#include "cc/scheduler/texture_uploader.h"
 
 #include "cc/base/util.h"
 #include "cc/resources/prioritized_resource.h"
diff --git a/cc/time_source.h b/cc/scheduler/time_source.h
index a036717..0b47a61 100644
--- a/cc/time_source.h
+++ b/cc/scheduler/time_source.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_TIME_SOURCE_H_
-#define CC_TIME_SOURCE_H_
+#ifndef CC_SCHEDULER_TIME_SOURCE_H_
+#define CC_SCHEDULER_TIME_SOURCE_H_
 
 #include "base/memory/ref_counted.h"
 #include "base/time.h"
@@ -43,4 +43,4 @@ class CC_EXPORT TimeSource : public base::RefCounted<TimeSource> {
 
 }  // namespace cc
 
-#endif  // CC_TIME_SOURCE_H_
+#endif  // CC_SCHEDULER_TIME_SOURCE_H_
diff --git a/cc/vsync_time_source.cc b/cc/scheduler/vsync_time_source.cc
index 8b2426b..166144f 100644
--- a/cc/vsync_time_source.cc
+++ b/cc/scheduler/vsync_time_source.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "cc/vsync_time_source.h"
+#include "cc/scheduler/vsync_time_source.h"
 
 namespace cc {
 
diff --git a/cc/vsync_time_source.h b/cc/scheduler/vsync_time_source.h
index fd0044f..8d0659c 100644
--- a/cc/vsync_time_source.h
+++ b/cc/scheduler/vsync_time_source.h
@@ -2,11 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CC_VSYNC_TIME_SOURCE_H_
-#define CC_VSYNC_TIME_SOURCE_H_
+#ifndef CC_SCHEDULER_VSYNC_TIME_SOURCE_H_
+#define CC_SCHEDULER_VSYNC_TIME_SOURCE_H_
 
 #include "cc/base/cc_export.h"
-#include "cc/time_source.h"
+#include "cc/scheduler/time_source.h"
 
 namespace cc {
 
@@ -64,4 +64,4 @@ class CC_EXPORT VSyncTimeSource : public TimeSource, public VSyncClient {
 
 }  // namespace cc
 
-#endif  // CC_VSYNC_TIME_SOURCE_H_
+#endif  // CC_SCHEDULER_VSYNC_TIME_SOURCE_H_
diff --git a/cc/vsync_time_source_unittest.cc b/cc/scheduler/vsync_time_source_unittest.cc
index 9833614..ea9c79d 100644
--- a/cc/vsync_time_source_unittest.cc
+++ b/cc/scheduler/vsync_time_source_unittest.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "cc/vsync_time_source.h"
+#include "cc/scheduler/vsync_time_source.h"
 
 #include "cc/test/scheduler_test_common.h"
 #include "testing/gtest/include/gtest/gtest.h"
diff --git a/cc/test/scheduler_test_common.h b/cc/test/scheduler_test_common.h
index 760ba2568..7f7df8c 100644
--- a/cc/test/scheduler_test_common.h
+++ b/cc/test/scheduler_test_common.h
@@ -8,8 +8,8 @@
 #include "base/memory/scoped_ptr.h"
 #include "base/time.h"
 #include "cc/base/thread.h"
-#include "cc/delay_based_time_source.h"
-#include "cc/frame_rate_controller.h"
+#include "cc/scheduler/delay_based_time_source.h"
+#include "cc/scheduler/frame_rate_controller.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace cc {
diff --git a/cc/test/tiled_layer_test_common.h b/cc/test/tiled_layer_test_common.h
index 8648455..8b49411 100644
--- a/cc/test/tiled_layer_test_common.h
+++ b/cc/test/tiled_layer_test_common.h
@@ -11,7 +11,7 @@
 #include "cc/resources/prioritized_resource.h"
 #include "cc/resources/resource_provider.h"
 #include "cc/resources/resource_update_queue.h"
-#include "cc/texture_uploader.h"
+#include "cc/scheduler/texture_uploader.h"
 #include "cc/tiled_layer.h"
 #include "cc/tiled_layer_impl.h"
 #include "ui/gfx/rect.h"
diff --git a/cc/trees/layer_tree_host.h b/cc/trees/layer_tree_host.h
index a192c5f..0b0d58d 100644
--- a/cc/trees/layer_tree_host.h
+++ b/cc/trees/layer_tree_host.h
@@ -19,7 +19,7 @@
 #include "cc/base/scoped_ptr_vector.h"
 #include "cc/debug/rendering_stats.h"
 #include "cc/output/output_surface.h"
-#include "cc/rate_limiter.h"
+#include "cc/scheduler/rate_limiter.h"
 #include "cc/trees/layer_tree_host_client.h"
 #include "cc/trees/layer_tree_host_common.h"
 #include "cc/trees/layer_tree_settings.h"
diff --git a/cc/trees/layer_tree_host_impl.cc b/cc/trees/layer_tree_host_impl.cc
index 17cd62f..0a4a584 100644
--- a/cc/trees/layer_tree_host_impl.cc
+++ b/cc/trees/layer_tree_host_impl.cc
@@ -21,7 +21,6 @@
 #include "cc/debug/overdraw_metrics.h"
 #include "cc/debug/paint_time_counter.h"
 #include "cc/debug/rendering_stats.h"
-#include "cc/delay_based_time_source.h"
 #include "cc/heads_up_display_layer_impl.h"
 #include "cc/input/page_scale_animation.h"
 #include "cc/input/top_controls_manager.h"
@@ -36,8 +35,9 @@
 #include "cc/resources/memory_history.h"
 #include "cc/resources/picture_layer_tiling.h"
 #include "cc/resources/prioritized_resource_manager.h"
+#include "cc/scheduler/delay_based_time_source.h"
+#include "cc/scheduler/texture_uploader.h"
 #include "cc/scrollbar_layer_impl.h"
-#include "cc/texture_uploader.h"
 #include "cc/trees/damage_tracker.h"
 #include "cc/trees/layer_tree_host.h"
 #include "cc/trees/layer_tree_host_common.h"
diff --git a/cc/trees/layer_tree_host_unittest.cc b/cc/trees/layer_tree_host_unittest.cc
index fa5c420..97308ea 100644
--- a/cc/trees/layer_tree_host_unittest.cc
+++ b/cc/trees/layer_tree_host_unittest.cc
@@ -7,13 +7,13 @@
 #include "base/synchronization/lock.h"
 #include "cc/content_layer.h"
 #include "cc/content_layer_client.h"
-#include "cc/frame_rate_controller.h"
 #include "cc/layer_impl.h"
 #include "cc/output/output_surface.h"
 #include "cc/picture_layer.h"
 #include "cc/resources/prioritized_resource.h"
 #include "cc/resources/prioritized_resource_manager.h"
 #include "cc/resources/resource_update_queue.h"
+#include "cc/scheduler/frame_rate_controller.h"
 #include "cc/scrollbar_layer.h"
 #include "cc/test/fake_content_layer.h"
 #include "cc/test/fake_content_layer_client.h"
diff --git a/cc/trees/thread_proxy.cc b/cc/trees/thread_proxy.cc
index e33f0e2..ffee9fd 100644
--- a/cc/trees/thread_proxy.cc
+++ b/cc/trees/thread_proxy.cc
@@ -8,14 +8,14 @@
 #include "base/bind.h"
 #include "base/debug/trace_event.h"
 #include "cc/base/thread.h"
-#include "cc/delay_based_time_source.h"
-#include "cc/frame_rate_controller.h"
 #include "cc/input/input_handler.h"
 #include "cc/output/context_provider.h"
 #include "cc/output/output_surface.h"
 #include "cc/quads/draw_quad.h"
 #include "cc/resources/prioritized_resource_manager.h"
-#include "cc/scheduler.h"
+#include "cc/scheduler/delay_based_time_source.h"
+#include "cc/scheduler/frame_rate_controller.h"
+#include "cc/scheduler/scheduler.h"
 #include "cc/trees/layer_tree_host.h"
 #include "cc/trees/layer_tree_impl.h"
 
diff --git a/cc/trees/thread_proxy.h b/cc/trees/thread_proxy.h
index 6241f27..d11b0a7 100644
--- a/cc/trees/thread_proxy.h
+++ b/cc/trees/thread_proxy.h
@@ -11,7 +11,7 @@
 #include "cc/animation/animation_events.h"
 #include "cc/base/completion_event.h"
 #include "cc/resources/resource_update_controller.h"
-#include "cc/scheduler.h"
+#include "cc/scheduler/scheduler.h"
 #include "cc/trees/layer_tree_host_impl.h"
 #include "cc/trees/proxy.h"