Part 7 of cc/ directory shuffles: trees

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

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

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

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

9 files changed, 13 insertions, 13 deletions

diff --git a/cc/test/fake_impl_proxy.h b/cc/test/fake_impl_proxy.h
index d1086d7..777da4a 100644
--- a/cc/test/fake_impl_proxy.h
+++ b/cc/test/fake_impl_proxy.h
@@ -5,8 +5,8 @@
 #ifndef CC_TEST_FAKE_IMPL_PROXY_H_
 #define CC_TEST_FAKE_IMPL_PROXY_H_
 
-#include "cc/single_thread_proxy.h"
 #include "cc/test/fake_proxy.h"
+#include "cc/trees/single_thread_proxy.h"
 
 namespace cc {
 
diff --git a/cc/test/fake_layer_tree_host_client.h b/cc/test/fake_layer_tree_host_client.h
index e781773..a7899a2 100644
--- a/cc/test/fake_layer_tree_host_client.h
+++ b/cc/test/fake_layer_tree_host_client.h
@@ -7,9 +7,9 @@
 
 #include "base/memory/scoped_ptr.h"
 #include "cc/input/input_handler.h"
-#include "cc/layer_tree_host.h"
 #include "cc/test/fake_context_provider.h"
 #include "cc/test/fake_output_surface.h"
+#include "cc/trees/layer_tree_host.h"
 
 namespace cc {
 
diff --git a/cc/test/fake_layer_tree_host_impl.h b/cc/test/fake_layer_tree_host_impl.h
index 54015dc..2023411 100644
--- a/cc/test/fake_layer_tree_host_impl.h
+++ b/cc/test/fake_layer_tree_host_impl.h
@@ -5,9 +5,9 @@
 #ifndef CC_TEST_FAKE_LAYER_TREE_HOST_IMPL_H_
 #define CC_TEST_FAKE_LAYER_TREE_HOST_IMPL_H_
 
-#include "cc/layer_tree_host_impl.h"
-#include "cc/single_thread_proxy.h"
 #include "cc/test/fake_layer_tree_host_impl_client.h"
+#include "cc/trees/layer_tree_host_impl.h"
+#include "cc/trees/single_thread_proxy.h"
 
 namespace cc {
 
diff --git a/cc/test/fake_layer_tree_host_impl_client.h b/cc/test/fake_layer_tree_host_impl_client.h
index e82c2d9..4ed6442 100644
--- a/cc/test/fake_layer_tree_host_impl_client.h
+++ b/cc/test/fake_layer_tree_host_impl_client.h
@@ -5,7 +5,7 @@
 #ifndef CC_TEST_FAKE_LAYER_TREE_HOST_IMPL_CLIENT_H_
 #define CC_TEST_FAKE_LAYER_TREE_HOST_IMPL_CLIENT_H_
 
-#include "cc/layer_tree_host_impl.h"
+#include "cc/trees/layer_tree_host_impl.h"
 
 namespace cc {
 
diff --git a/cc/test/fake_proxy.h b/cc/test/fake_proxy.h
index 53399fa..3b84723 100644
--- a/cc/test/fake_proxy.h
+++ b/cc/test/fake_proxy.h
@@ -6,8 +6,8 @@
 #define CC_TEST_FAKE_PROXY_H_
 
 #include "cc/base/thread.h"
-#include "cc/layer_tree_host.h"
-#include "cc/proxy.h"
+#include "cc/trees/layer_tree_host.h"
+#include "cc/trees/proxy.h"
 
 namespace cc {
 
diff --git a/cc/test/layer_tree_pixel_test.cc b/cc/test/layer_tree_pixel_test.cc
index 87cbd8f..250633f 100644
--- a/cc/test/layer_tree_pixel_test.cc
+++ b/cc/test/layer_tree_pixel_test.cc
@@ -5,9 +5,9 @@
 #include "cc/test/layer_tree_pixel_test.h"
 
 #include "base/path_service.h"
-#include "cc/layer_tree_impl.h"
 #include "cc/test/paths.h"
 #include "cc/test/pixel_test_utils.h"
+#include "cc/trees/layer_tree_impl.h"
 #include "ui/gl/gl_implementation.h"
 #include "webkit/gpu/context_provider_in_process.h"
 #include "webkit/gpu/webgraphicscontext3d_in_process_command_buffer_impl.h"
diff --git a/cc/test/layer_tree_test_common.cc b/cc/test/layer_tree_test_common.cc
index f4bffcb..c9a0e472 100644
--- a/cc/test/layer_tree_test_common.cc
+++ b/cc/test/layer_tree_test_common.cc
@@ -12,14 +12,14 @@
 #include "cc/input/input_handler.h"
 #include "cc/layer.h"
 #include "cc/layer_impl.h"
-#include "cc/layer_tree_host_impl.h"
-#include "cc/single_thread_proxy.h"
 #include "cc/test/animation_test_common.h"
 #include "cc/test/fake_layer_tree_host_client.h"
 #include "cc/test/fake_output_surface.h"
 #include "cc/test/occlusion_tracker_test_common.h"
 #include "cc/test/tiled_layer_test_common.h"
 #include "cc/timing_function.h"
+#include "cc/trees/layer_tree_host_impl.h"
+#include "cc/trees/single_thread_proxy.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "third_party/WebKit/Source/Platform/chromium/public/WebFilterOperation.h"
 #include "third_party/WebKit/Source/Platform/chromium/public/WebFilterOperations.h"
diff --git a/cc/test/layer_tree_test_common.h b/cc/test/layer_tree_test_common.h
index 028e2f6..cc3e855 100644
--- a/cc/test/layer_tree_test_common.h
+++ b/cc/test/layer_tree_test_common.h
@@ -8,8 +8,8 @@
 #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/trees/layer_tree_host.h"
+#include "cc/trees/layer_tree_host_impl.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/WebKit/Source/Platform/chromium/public/WebAnimationDelegate.h"
 
diff --git a/cc/test/occlusion_tracker_test_common.h b/cc/test/occlusion_tracker_test_common.h
index 59a2031..494d94d 100644
--- a/cc/test/occlusion_tracker_test_common.h
+++ b/cc/test/occlusion_tracker_test_common.h
@@ -5,9 +5,9 @@
 #ifndef CC_TEST_OCCLUSION_TRACKER_TEST_COMMON_H_
 #define CC_TEST_OCCLUSION_TRACKER_TEST_COMMON_H_
 
-#include "cc/occlusion_tracker.h"
 #include "cc/render_surface.h"
 #include "cc/render_surface_impl.h"
+#include "cc/trees/occlusion_tracker.h"
 
 namespace cc {