Part 1 of cc/ directory shuffles: base

This establishes cc/base/ as discussed in https://groups.google.com/a/chromium.org/d/msg/graphics-dev/wNRsl3BwU_Y/jFXeRQq7e30J.

This patch will likely touch the most locations since it moves cc/switches.h

BUG=190824
TBR=piman@chromium.org, thakis@chromium.org

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

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

7 files changed, 9 insertions, 9 deletions

diff --git a/cc/test/fake_proxy.h b/cc/test/fake_proxy.h
index a29c765..53399fa 100644
--- a/cc/test/fake_proxy.h
+++ b/cc/test/fake_proxy.h
@@ -5,9 +5,9 @@
 #ifndef CC_TEST_FAKE_PROXY_H_
 #define CC_TEST_FAKE_PROXY_H_
 
+#include "cc/base/thread.h"
 #include "cc/layer_tree_host.h"
 #include "cc/proxy.h"
-#include "cc/thread.h"
 
 namespace cc {
 
diff --git a/cc/test/layer_test_common.cc b/cc/test/layer_test_common.cc
index 34d7c1b..c79504a 100644
--- a/cc/test/layer_test_common.cc
+++ b/cc/test/layer_test_common.cc
@@ -4,13 +4,13 @@
 
 #include "cc/test/layer_test_common.h"
 
+#include "cc/base/math_util.h"
+#include "cc/base/region.h"
 #include "cc/draw_quad.h"
-#include "cc/math_util.h"
-#include "cc/region.h"
 #include "cc/render_pass.h"
 #include "testing/gtest/include/gtest/gtest.h"
-#include "ui/gfx/rect.h"
 #include "ui/gfx/point_conversions.h"
+#include "ui/gfx/rect.h"
 #include "ui/gfx/rect_conversions.h"
 #include "ui/gfx/size_conversions.h"
 
diff --git a/cc/test/layer_tree_test_common.cc b/cc/test/layer_tree_test_common.cc
index b9ef754..8528a3c 100644
--- a/cc/test/layer_tree_test_common.cc
+++ b/cc/test/layer_tree_test_common.cc
@@ -6,6 +6,7 @@
 
 #include "cc/animation.h"
 #include "cc/animation_registrar.h"
+#include "cc/base/thread_impl.h"
 #include "cc/content_layer.h"
 #include "cc/input_handler.h"
 #include "cc/layer.h"
@@ -13,7 +14,6 @@
 #include "cc/layer_impl.h"
 #include "cc/layer_tree_host_impl.h"
 #include "cc/single_thread_proxy.h"
-#include "cc/thread_impl.h"
 #include "cc/test/animation_test_common.h"
 #include "cc/test/fake_layer_tree_host_client.h"
 #include "cc/test/fake_output_surface.h"
diff --git a/cc/test/layer_tree_test_common.h b/cc/test/layer_tree_test_common.h
index 2808fa9..028e2f6 100644
--- a/cc/test/layer_tree_test_common.h
+++ b/cc/test/layer_tree_test_common.h
@@ -7,9 +7,9 @@
 
 #include "base/memory/ref_counted.h"
 #include "base/threading/thread.h"
+#include "cc/base/thread.h"
 #include "cc/layer_tree_host.h"
 #include "cc/layer_tree_host_impl.h"
-#include "cc/thread.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/WebKit/Source/Platform/chromium/public/WebAnimationDelegate.h"
 
diff --git a/cc/test/render_pass_test_utils.h b/cc/test/render_pass_test_utils.h
index d9c2c91..0591e5a 100644
--- a/cc/test/render_pass_test_utils.h
+++ b/cc/test/render_pass_test_utils.h
@@ -5,8 +5,8 @@
 #ifndef CC_TEST_RENDER_PASS_TEST_UTILS_H_
 #define CC_TEST_RENDER_PASS_TEST_UTILS_H_
 
+#include "cc/base/scoped_ptr_vector.h"
 #include "cc/render_pass.h"
-#include "cc/scoped_ptr_vector.h"
 #include "third_party/skia/include/core/SkColor.h"
 
 namespace gfx {
diff --git a/cc/test/scheduler_test_common.h b/cc/test/scheduler_test_common.h
index b85440e..e5faaa5 100644
--- a/cc/test/scheduler_test_common.h
+++ b/cc/test/scheduler_test_common.h
@@ -6,9 +6,9 @@
 #define CC_TEST_SCHEDULER_TEST_COMMON_H_
 
 #include "base/memory/scoped_ptr.h"
+#include "cc/base/thread.h"
 #include "cc/delay_based_time_source.h"
 #include "cc/frame_rate_controller.h"
-#include "cc/thread.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 c9f7084..549360f 100644
--- a/cc/test/tiled_layer_test_common.h
+++ b/cc/test/tiled_layer_test_common.h
@@ -5,9 +5,9 @@
 #ifndef CC_TEST_TILED_LAYER_TEST_COMMON_H_
 #define CC_TEST_TILED_LAYER_TEST_COMMON_H_
 
+#include "cc/base/region.h"
 #include "cc/layer_updater.h"
 #include "cc/prioritized_resource.h"
-#include "cc/region.h"
 #include "cc/resource_provider.h"
 #include "cc/resource_update_queue.h"
 #include "cc/texture_copier.h"