Move test-only stuff from cc/debug/ to cc/test

This moves the test/fake context implementations from cc/debug/ to cc/test
and stops linking them into production targets. Test targets elsewhere in
the tree can link against cc_test_support to use these.

R=danakj,piman

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

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

39 files changed, 106 insertions, 123 deletions

diff --git a/cc/cc.gyp b/cc/cc.gyp
index deb2fbd..17e8842 100644
--- a/cc/cc.gyp
+++ b/cc/cc.gyp
@@ -76,8 +76,6 @@
         'debug/debug_rect_history.cc',
         'debug/debug_rect_history.h',
         'debug/devtools_instrumentation.h',
-        'debug/fake_web_graphics_context_3d.cc',
-        'debug/fake_web_graphics_context_3d.h',
         'debug/frame_rate_counter.cc',
         'debug/frame_rate_counter.h',
         'debug/layer_tree_debug_state.cc',
@@ -86,8 +84,6 @@
         'debug/micro_benchmark.h',
         'debug/micro_benchmark_controller.cc',
         'debug/micro_benchmark_controller.h',
-        'debug/ordered_texture_map.cc',
-        'debug/ordered_texture_map.h',
         'debug/overdraw_metrics.cc',
         'debug/overdraw_metrics.h',
         'debug/paint_time_counter.cc',
@@ -99,14 +95,6 @@
         'debug/rendering_stats_instrumentation.cc',
         'debug/rendering_stats_instrumentation.h',
         'debug/ring_buffer.h',
-        'debug/test_context_provider.cc',
-        'debug/test_context_provider.h',
-        'debug/test_context_support.cc',
-        'debug/test_context_support.h',
-        'debug/test_texture.cc',
-        'debug/test_texture.h',
-        'debug/test_web_graphics_context_3d.cc',
-        'debug/test_web_graphics_context_3d.h',
         'debug/traced_picture.cc',
         'debug/traced_picture.h',
         'debug/traced_value.cc',
diff --git a/cc/cc_tests.gyp b/cc/cc_tests.gyp
index 49e82fc..29e2708 100644
--- a/cc/cc_tests.gyp
+++ b/cc/cc_tests.gyp
@@ -114,14 +114,18 @@
       'test/fake_delegated_renderer_layer_impl.cc',
       'test/fake_delegated_renderer_layer_impl.h',
       'test/fake_impl_proxy.h',
+      'test/fake_layer_tree_host.cc',
+      'test/fake_layer_tree_host.h',
       'test/fake_layer_tree_host_client.cc',
       'test/fake_layer_tree_host_client.h',
       'test/fake_layer_tree_host_impl.cc',
+      'test/fake_layer_tree_host_impl.h',
       'test/fake_layer_tree_host_impl_client.cc',
       'test/fake_layer_tree_host_impl_client.h',
-      'test/fake_layer_tree_host_impl.h',
-      'test/fake_layer_tree_host.cc',
-      'test/fake_layer_tree_host.h',
+      'test/fake_output_surface.cc',
+      'test/fake_output_surface.h',
+      'test/fake_output_surface_client.cc',
+      'test/fake_output_surface_client.h',
       'test/fake_painted_scrollbar_layer.cc',
       'test/fake_painted_scrollbar_layer.h',
       'test/fake_picture_layer.cc',
@@ -135,56 +139,68 @@
       'test/fake_proxy.cc',
       'test/fake_proxy.h',
       'test/fake_rendering_stats_instrumentation.h',
+      'test/fake_scoped_ui_resource.cc',
+      'test/fake_scoped_ui_resource.h',
       'test/fake_scrollbar.cc',
       'test/fake_scrollbar.h',
       'test/fake_tile_manager.cc',
       'test/fake_tile_manager.h',
-      'test/fake_tile_manager_client.h',
       'test/fake_tile_manager_client.cc',
-      'test/fake_ui_resource_layer_tree_host_impl.h',
+      'test/fake_tile_manager_client.h',
       'test/fake_ui_resource_layer_tree_host_impl.cc',
-      'test/fake_output_surface.cc',
-      'test/fake_output_surface.h',
-      'test/fake_output_surface_client.cc',
-      'test/fake_output_surface_client.h',
-      'test/fake_scoped_ui_resource.cc',
-      'test/fake_scoped_ui_resource.h',
+      'test/fake_ui_resource_layer_tree_host_impl.h',
       'test/fake_video_frame_provider.cc',
       'test/fake_video_frame_provider.h',
+      'test/fake_web_graphics_context_3d.cc',
+      'test/fake_web_graphics_context_3d.h',
       'test/geometry_test_utils.cc',
       'test/geometry_test_utils.h',
       'test/impl_side_painting_settings.h',
       'test/layer_test_common.cc',
       'test/layer_test_common.h',
+      'test/layer_tree_json_parser.cc',
+      'test/layer_tree_json_parser.h',
       'test/layer_tree_pixel_test.cc',
       'test/layer_tree_pixel_test.h',
       'test/layer_tree_test.cc',
       'test/layer_tree_test.h',
-      'test/layer_tree_json_parser.cc',
-      'test/layer_tree_json_parser.h',
       'test/mock_quad_culler.cc',
       'test/mock_quad_culler.h',
       'test/occlusion_tracker_test_common.h',
+      'test/ordered_texture_map.cc',
+      'test/ordered_texture_map.h',
       'test/paths.cc',
       'test/paths.h',
+      'test/pixel_comparator.cc',
+      'test/pixel_comparator.h',
       'test/pixel_test.cc',
       'test/pixel_test.h',
       'test/pixel_test_output_surface.cc',
       'test/pixel_test_output_surface.h',
       'test/pixel_test_software_output_device.cc',
       'test/pixel_test_software_output_device.h',
+      'test/pixel_test_utils.cc',
+      'test/pixel_test_utils.h',
       'test/render_pass_test_common.cc',
       'test/render_pass_test_common.h',
       'test/render_pass_test_utils.cc',
       'test/render_pass_test_utils.h',
       'test/scheduler_test_common.cc',
       'test/scheduler_test_common.h',
-      'test/solid_color_content_layer_client.h',
-      'test/solid_color_content_layer_client.cc',
       'test/skia_common.cc',
       'test/skia_common.h',
+      'test/solid_color_content_layer_client.cc',
+      'test/solid_color_content_layer_client.h',
+      'test/test_context_provider.cc',
+      'test/test_context_provider.h',
+      'test/test_context_support.cc',
+      'test/test_context_support.h',
+      'test/test_texture.cc',
+      'test/test_texture.h',
       'test/test_tile_priorities.cc',
       'test/test_tile_priorities.h',
+      'test/test_web_graphics_context_3d.cc',
+      'test/test_web_graphics_context_3d.h',
       'test/tiled_layer_test_common.cc',
       'test/tiled_layer_test_common.h',
     ],
@@ -204,7 +220,6 @@
         '../webkit/common/gpu/webkit_gpu.gyp:webkit_gpu',
         'cc.gyp:cc',
         'cc_test_support',
-        'cc_test_utils',
       ],
       'sources': [
         'test/run_all_unittests.cc',
@@ -299,6 +314,8 @@
         '..',
       ],
       'dependencies': [
+        '../base/base.gyp:base',
+        '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
         '../skia/skia.gyp:skia',
         '../testing/gmock.gyp:gmock',
         '../testing/gtest.gyp:gtest',
@@ -306,6 +323,7 @@
         '../third_party/mesa/mesa.gyp:osmesa',
         '../ui/gfx/gfx.gyp:gfx',
         '../ui/gl/gl.gyp:gl',
+        '../ui/ui_unittests.gyp:ui_test_support',
       ],
       'sources': [
         '<@(cc_tests_support_files)',
@@ -313,24 +331,6 @@
       # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
       'msvs_disabled_warnings': [ 4267, ],
     },
-    {
-      'target_name': 'cc_test_utils',
-      'type': 'static_library',
-      'include_dirs': [
-        '..'
-      ],
-      'sources': [
-        'test/pixel_comparator.cc',
-        'test/pixel_comparator.h',
-        'test/pixel_test_utils.cc',
-        'test/pixel_test_utils.h',
-      ],
-      'dependencies': [
-        '../skia/skia.gyp:skia',
-        '../ui/gfx/gfx.gyp:gfx',
-        '../ui/ui_unittests.gyp:ui_test_support',
-      ],
-    },
   ],
   'conditions': [
     # Special target to wrap a gtest_target_type==shared_library
diff --git a/cc/layers/delegated_renderer_layer_impl_unittest.cc b/cc/layers/delegated_renderer_layer_impl_unittest.cc
index 05e8513..c8811a2 100644
--- a/cc/layers/delegated_renderer_layer_impl_unittest.cc
+++ b/cc/layers/delegated_renderer_layer_impl_unittest.cc
@@ -5,7 +5,6 @@
 #include "cc/layers/delegated_renderer_layer_impl.h"
 
 #include "cc/base/scoped_ptr_vector.h"
-#include "cc/debug/test_web_graphics_context_3d.h"
 #include "cc/layers/append_quads_data.h"
 #include "cc/layers/quad_sink.h"
 #include "cc/layers/solid_color_layer_impl.h"
@@ -21,6 +20,7 @@
 #include "cc/test/mock_quad_culler.h"
 #include "cc/test/render_pass_test_common.h"
 #include "cc/test/render_pass_test_utils.h"
+#include "cc/test/test_web_graphics_context_3d.h"
 #include "cc/trees/layer_tree_host_impl.h"
 #include "cc/trees/layer_tree_impl.h"
 #include "cc/trees/single_thread_proxy.h"
diff --git a/cc/layers/picture_layer_impl_unittest.cc b/cc/layers/picture_layer_impl_unittest.cc
index 7493e38..716d50d 100644
--- a/cc/layers/picture_layer_impl_unittest.cc
+++ b/cc/layers/picture_layer_impl_unittest.cc
@@ -6,7 +6,6 @@
 
 #include <utility>
 
-#include "cc/debug/test_web_graphics_context_3d.h"
 #include "cc/layers/append_quads_data.h"
 #include "cc/layers/picture_layer.h"
 #include "cc/test/fake_content_layer_client.h"
@@ -18,6 +17,7 @@
 #include "cc/test/geometry_test_utils.h"
 #include "cc/test/impl_side_painting_settings.h"
 #include "cc/test/mock_quad_culler.h"
+#include "cc/test/test_web_graphics_context_3d.h"
 #include "cc/trees/layer_tree_impl.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/skia/include/core/SkBitmapDevice.h"
diff --git a/cc/layers/scrollbar_layer_unittest.cc b/cc/layers/scrollbar_layer_unittest.cc
index 0423cdc..df12b73 100644
--- a/cc/layers/scrollbar_layer_unittest.cc
+++ b/cc/layers/scrollbar_layer_unittest.cc
@@ -4,7 +4,6 @@
 
 #include "base/containers/hash_tables.h"
 #include "cc/animation/scrollbar_animation_controller.h"
-#include "cc/debug/test_web_graphics_context_3d.h"
 #include "cc/layers/append_quads_data.h"
 #include "cc/layers/painted_scrollbar_layer.h"
 #include "cc/layers/painted_scrollbar_layer_impl.h"
@@ -22,6 +21,7 @@
 #include "cc/test/geometry_test_utils.h"
 #include "cc/test/layer_tree_test.h"
 #include "cc/test/mock_quad_culler.h"
+#include "cc/test/test_web_graphics_context_3d.h"
 #include "cc/trees/layer_tree_host.h"
 #include "cc/trees/layer_tree_impl.h"
 #include "cc/trees/single_thread_proxy.h"
diff --git a/cc/layers/texture_layer_unittest.cc b/cc/layers/texture_layer_unittest.cc
index 63cf132..1ee8dfb 100644
--- a/cc/layers/texture_layer_unittest.cc
+++ b/cc/layers/texture_layer_unittest.cc
@@ -12,7 +12,6 @@
 #include "base/synchronization/waitable_event.h"
 #include "base/threading/thread.h"
 #include "base/time/time.h"
-#include "cc/debug/test_web_graphics_context_3d.h"
 #include "cc/layers/solid_color_layer.h"
 #include "cc/layers/texture_layer_client.h"
 #include "cc/layers/texture_layer_impl.h"
@@ -25,6 +24,7 @@
 #include "cc/test/fake_output_surface.h"
 #include "cc/test/layer_test_common.h"
 #include "cc/test/layer_tree_test.h"
+#include "cc/test/test_web_graphics_context_3d.h"
 #include "cc/trees/blocking_task_runner.h"
 #include "cc/trees/layer_tree_host.h"
 #include "cc/trees/layer_tree_impl.h"
diff --git a/cc/output/gl_renderer_unittest.cc b/cc/output/gl_renderer_unittest.cc
index 8b71ca4..174a27a 100644
--- a/cc/output/gl_renderer_unittest.cc
+++ b/cc/output/gl_renderer_unittest.cc
@@ -7,7 +7,6 @@
 #include <set>
 
 #include "cc/base/math_util.h"
-#include "cc/debug/test_web_graphics_context_3d.h"
 #include "cc/output/compositor_frame_metadata.h"
 #include "cc/resources/prioritized_resource_manager.h"
 #include "cc/resources/resource_provider.h"
@@ -19,6 +18,7 @@
 #include "cc/test/pixel_test.h"
 #include "cc/test/render_pass_test_common.h"
 #include "cc/test/render_pass_test_utils.h"
+#include "cc/test/test_web_graphics_context_3d.h"
 #include "gpu/GLES2/gl2extchromium.h"
 #include "gpu/command_buffer/client/context_support.h"
 #include "testing/gmock/include/gmock/gmock.h"
diff --git a/cc/output/output_surface_unittest.cc b/cc/output/output_surface_unittest.cc
index 1a1db29..a2ca1dd 100644
--- a/cc/output/output_surface_unittest.cc
+++ b/cc/output/output_surface_unittest.cc
@@ -5,14 +5,14 @@
 #include "cc/output/output_surface.h"
 
 #include "base/test/test_simple_task_runner.h"
-#include "cc/debug/test_context_provider.h"
-#include "cc/debug/test_web_graphics_context_3d.h"
 #include "cc/output/managed_memory_policy.h"
 #include "cc/output/output_surface_client.h"
 #include "cc/output/software_output_device.h"
 #include "cc/test/fake_output_surface.h"
 #include "cc/test/fake_output_surface_client.h"
 #include "cc/test/scheduler_test_common.h"
+#include "cc/test/test_context_provider.h"
+#include "cc/test/test_web_graphics_context_3d.h"
 #include "gpu/GLES2/gl2extchromium.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/gfx/frame_time.h"
diff --git a/cc/output/shader_unittest.cc b/cc/output/shader_unittest.cc
index 33cc13c..a608d93 100644
--- a/cc/output/shader_unittest.cc
+++ b/cc/output/shader_unittest.cc
@@ -4,7 +4,7 @@
 
 #include "cc/output/shader.h"
 
-#include "cc/debug/fake_web_graphics_context_3d.h"
+#include "cc/test/fake_web_graphics_context_3d.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/gfx/point.h"
 #include "ui/gfx/size.h"
diff --git a/cc/resources/raster_worker_pool_unittest.cc b/cc/resources/raster_worker_pool_unittest.cc
index 023be79..2c8973b 100644
--- a/cc/resources/raster_worker_pool_unittest.cc
+++ b/cc/resources/raster_worker_pool_unittest.cc
@@ -7,7 +7,6 @@
 #include <limits>
 #include <vector>
 
-#include "cc/debug/test_web_graphics_context_3d.h"
 #include "cc/resources/image_raster_worker_pool.h"
 #include "cc/resources/picture_pile.h"
 #include "cc/resources/picture_pile_impl.h"
@@ -16,6 +15,7 @@
 #include "cc/resources/scoped_resource.h"
 #include "cc/test/fake_output_surface.h"
 #include "cc/test/fake_output_surface_client.h"
+#include "cc/test/test_web_graphics_context_3d.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace cc {
diff --git a/cc/resources/resource_provider_unittest.cc b/cc/resources/resource_provider_unittest.cc
index a0b6523..baf7e8c 100644
--- a/cc/resources/resource_provider_unittest.cc
+++ b/cc/resources/resource_provider_unittest.cc
@@ -5,20 +5,21 @@
 #include "cc/resources/resource_provider.h"
 
 #include <algorithm>
+#include <map>
 
 #include "base/bind.h"
 #include "base/containers/hash_tables.h"
 #include "base/logging.h"
 #include "base/memory/ref_counted.h"
 #include "cc/base/scoped_ptr_deque.h"
-#include "cc/debug/test_texture.h"
-#include "cc/debug/test_web_graphics_context_3d.h"
 #include "cc/output/output_surface.h"
 #include "cc/resources/returned_resource.h"
 #include "cc/resources/shared_bitmap_manager.h"
 #include "cc/resources/single_release_callback.h"
 #include "cc/test/fake_output_surface.h"
 #include "cc/test/fake_output_surface_client.h"
+#include "cc/test/test_texture.h"
+#include "cc/test/test_web_graphics_context_3d.h"
 #include "gpu/GLES2/gl2extchromium.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
diff --git a/cc/resources/resource_update_controller_unittest.cc b/cc/resources/resource_update_controller_unittest.cc
index 9f43f80..da413ef 100644
--- a/cc/resources/resource_update_controller_unittest.cc
+++ b/cc/resources/resource_update_controller_unittest.cc
@@ -5,12 +5,12 @@
 #include "cc/resources/resource_update_controller.h"
 
 #include "base/test/test_simple_task_runner.h"
-#include "cc/debug/test_web_graphics_context_3d.h"
 #include "cc/resources/prioritized_resource_manager.h"
 #include "cc/test/fake_output_surface.h"
 #include "cc/test/fake_output_surface_client.h"
 #include "cc/test/fake_proxy.h"
 #include "cc/test/scheduler_test_common.h"
+#include "cc/test/test_web_graphics_context_3d.h"
 #include "cc/test/tiled_layer_test_common.h"
 #include "cc/trees/single_thread_proxy.h"  // For DebugScopedSetImplThread
 #include "testing/gtest/include/gtest/gtest.h"
diff --git a/cc/resources/texture_mailbox_deleter_unittest.cc b/cc/resources/texture_mailbox_deleter_unittest.cc
index a6ec48e..d08da84 100644
--- a/cc/resources/texture_mailbox_deleter_unittest.cc
+++ b/cc/resources/texture_mailbox_deleter_unittest.cc
@@ -4,9 +4,9 @@
 
 #include "cc/resources/texture_mailbox_deleter.h"
 
-#include "cc/debug/test_context_provider.h"
-#include "cc/debug/test_web_graphics_context_3d.h"
 #include "cc/resources/single_release_callback.h"
+#include "cc/test/test_context_provider.h"
+#include "cc/test/test_web_graphics_context_3d.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace cc {
diff --git a/cc/resources/video_resource_updater_unittest.cc b/cc/resources/video_resource_updater_unittest.cc
index 028e0a6..86cbc3f 100644
--- a/cc/resources/video_resource_updater_unittest.cc
+++ b/cc/resources/video_resource_updater_unittest.cc
@@ -5,10 +5,10 @@
 #include "cc/resources/video_resource_updater.h"
 
 #include "base/memory/shared_memory.h"
-#include "cc/debug/test_web_graphics_context_3d.h"
 #include "cc/resources/resource_provider.h"
 #include "cc/test/fake_output_surface.h"
 #include "cc/test/fake_output_surface_client.h"
+#include "cc/test/test_web_graphics_context_3d.h"
 #include "media/base/video_frame.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
diff --git a/cc/scheduler/texture_uploader_unittest.cc b/cc/scheduler/texture_uploader_unittest.cc
index 68413df..ef21146 100644
--- a/cc/scheduler/texture_uploader_unittest.cc
+++ b/cc/scheduler/texture_uploader_unittest.cc
@@ -5,8 +5,8 @@
 #include "cc/scheduler/texture_uploader.h"
 
 #include "cc/base/util.h"
-#include "cc/debug/test_web_graphics_context_3d.h"
 #include "cc/resources/prioritized_resource.h"
+#include "cc/test/test_web_graphics_context_3d.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/khronos/GLES2/gl2.h"
diff --git a/cc/test/fake_layer_tree_host_client.cc b/cc/test/fake_layer_tree_host_client.cc
index b74b094..1ee0bb8 100644
--- a/cc/test/fake_layer_tree_host_client.cc
+++ b/cc/test/fake_layer_tree_host_client.cc
@@ -4,9 +4,9 @@
 
 #include "cc/test/fake_layer_tree_host_client.h"
 
-#include "cc/debug/test_web_graphics_context_3d.h"
 #include "cc/output/context_provider.h"
 #include "cc/test/fake_output_surface.h"
+#include "cc/test/test_web_graphics_context_3d.h"
 
 namespace cc {
 
diff --git a/cc/test/fake_layer_tree_host_client.h b/cc/test/fake_layer_tree_host_client.h
index a1e1708..0bad7ad 100644
--- a/cc/test/fake_layer_tree_host_client.h
+++ b/cc/test/fake_layer_tree_host_client.h
@@ -6,8 +6,8 @@
 #define CC_TEST_FAKE_LAYER_TREE_HOST_CLIENT_H_
 
 #include "base/memory/scoped_ptr.h"
-#include "cc/debug/test_context_provider.h"
 #include "cc/input/input_handler.h"
+#include "cc/test/test_context_provider.h"
 #include "cc/trees/layer_tree_host.h"
 
 namespace cc {
diff --git a/cc/test/fake_output_surface.h b/cc/test/fake_output_surface.h
index 0540f13..0a85f4d 100644
--- a/cc/test/fake_output_surface.h
+++ b/cc/test/fake_output_surface.h
@@ -8,13 +8,13 @@
 #include "base/callback.h"
 #include "base/logging.h"
 #include "base/time/time.h"
-#include "cc/debug/test_context_provider.h"
-#include "cc/debug/test_web_graphics_context_3d.h"
 #include "cc/output/begin_frame_args.h"
 #include "cc/output/compositor_frame.h"
 #include "cc/output/managed_memory_policy.h"
 #include "cc/output/output_surface.h"
 #include "cc/output/software_output_device.h"
+#include "cc/test/test_context_provider.h"
+#include "cc/test/test_web_graphics_context_3d.h"
 
 namespace cc {
 
diff --git a/cc/debug/fake_web_graphics_context_3d.cc b/cc/test/fake_web_graphics_context_3d.cc
index eab653b..d822cfe 100644
--- a/cc/debug/fake_web_graphics_context_3d.cc
+++ b/cc/test/fake_web_graphics_context_3d.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/debug/fake_web_graphics_context_3d.h"
+#include "cc/test/fake_web_graphics_context_3d.h"
 
 #include "base/logging.h"
 #include "third_party/khronos/GLES2/gl2.h"
diff --git a/cc/debug/fake_web_graphics_context_3d.h b/cc/test/fake_web_graphics_context_3d.h
index f923f714..35f55c6 100644
--- a/cc/debug/fake_web_graphics_context_3d.h
+++ b/cc/test/fake_web_graphics_context_3d.h
@@ -2,21 +2,18 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CC_DEBUG_FAKE_WEB_GRAPHICS_CONTEXT_3D_H_
-#define CC_DEBUG_FAKE_WEB_GRAPHICS_CONTEXT_3D_H_
+#ifndef CC_TEST_FAKE_WEB_GRAPHICS_CONTEXT_3D_H_
+#define CC_TEST_FAKE_WEB_GRAPHICS_CONTEXT_3D_H_
 
 #include <string>
 
-#include "base/compiler_specific.h"
-#include "cc/base/cc_export.h"
 #include "third_party/WebKit/public/platform/WebGraphicsContext3D.h"
 
 namespace cc {
 
 // WebGraphicsContext3D base class for use in unit tests.
 // All operations are no-ops (returning 0 if necessary).
-class CC_EXPORT FakeWebGraphicsContext3D
-    : public NON_EXPORTED_BASE(WebKit::WebGraphicsContext3D) {
+class FakeWebGraphicsContext3D : public WebKit::WebGraphicsContext3D {
  public:
   FakeWebGraphicsContext3D();
   virtual ~FakeWebGraphicsContext3D();
@@ -614,4 +611,4 @@ class CC_EXPORT FakeWebGraphicsContext3D
 
 }  // namespace cc
 
-#endif  // CC_DEBUG_FAKE_WEB_GRAPHICS_CONTEXT_3D_H_
+#endif  // CC_TEST_FAKE_WEB_GRAPHICS_CONTEXT_3D_H_
diff --git a/cc/test/fake_web_graphics_context_3d_unittest.cc b/cc/test/fake_web_graphics_context_3d_unittest.cc
index ef0f143f..3d119ee 100644
--- a/cc/test/fake_web_graphics_context_3d_unittest.cc
+++ b/cc/test/fake_web_graphics_context_3d_unittest.cc
@@ -4,7 +4,7 @@
 
 #include "base/compiler_specific.h"
 #include "base/memory/scoped_ptr.h"
-#include "cc/debug/test_web_graphics_context_3d.h"
+#include "cc/test/test_web_graphics_context_3d.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
diff --git a/cc/test/layer_tree_test.cc b/cc/test/layer_tree_test.cc
index 9ca0bbd..7ad2966 100644
--- a/cc/test/layer_tree_test.cc
+++ b/cc/test/layer_tree_test.cc
@@ -10,7 +10,6 @@
 #include "cc/animation/layer_animation_controller.h"
 #include "cc/animation/timing_function.h"
 #include "cc/base/switches.h"
-#include "cc/debug/test_context_provider.h"
 #include "cc/input/input_handler.h"
 #include "cc/layers/content_layer.h"
 #include "cc/layers/layer.h"
@@ -19,6 +18,7 @@
 #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/test_context_provider.h"
 #include "cc/test/tiled_layer_test_common.h"
 #include "cc/trees/layer_tree_host_impl.h"
 #include "cc/trees/single_thread_proxy.h"
diff --git a/cc/debug/ordered_texture_map.cc b/cc/test/ordered_texture_map.cc
index 5727def..71b20a4 100644
--- a/cc/debug/ordered_texture_map.cc
+++ b/cc/test/ordered_texture_map.cc
@@ -2,10 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "cc/debug/ordered_texture_map.h"
+#include "cc/test/ordered_texture_map.h"
 
 #include "base/logging.h"
-#include "cc/debug/test_texture.h"
+#include "cc/test/test_texture.h"
 
 namespace cc {
 
diff --git a/cc/debug/ordered_texture_map.h b/cc/test/ordered_texture_map.h
index b4fef46..852e86b 100644
--- a/cc/debug/ordered_texture_map.h
+++ b/cc/test/ordered_texture_map.h
@@ -2,21 +2,20 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CC_DEBUG_ORDERED_TEXTURE_MAP_H_
-#define CC_DEBUG_ORDERED_TEXTURE_MAP_H_
+#ifndef CC_TEST_ORDERED_TEXTURE_MAP_H_
+#define CC_TEST_ORDERED_TEXTURE_MAP_H_
 
 #include <vector>
 
 #include "base/containers/hash_tables.h"
 #include "base/memory/ref_counted.h"
-#include "cc/base/cc_export.h"
 #include "third_party/WebKit/public/platform/WebGraphicsContext3D.h"
 
 namespace cc {
 
 struct TestTexture;
 
-class CC_EXPORT OrderedTextureMap {
+class OrderedTextureMap {
  public:
   OrderedTextureMap();
   ~OrderedTextureMap();
@@ -43,4 +42,4 @@ class CC_EXPORT OrderedTextureMap {
 
 }  // namespace cc
 
-#endif  // CC_DEBUG_ORDERED_TEXTURE_MAP_H_
+#endif  // CC_TEST_ORDERED_TEXTURE_MAP_H_
diff --git a/cc/debug/test_context_provider.cc b/cc/test/test_context_provider.cc
index 873889a..fbe6ea2 100644
--- a/cc/debug/test_context_provider.cc
+++ b/cc/test/test_context_provider.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/debug/test_context_provider.h"
+#include "cc/test/test_context_provider.h"
 
 #include <set>
 #include <vector>
@@ -11,7 +11,7 @@
 #include "base/callback_helpers.h"
 #include "base/logging.h"
 #include "base/strings/string_split.h"
-#include "cc/debug/test_web_graphics_context_3d.h"
+#include "cc/test/test_web_graphics_context_3d.h"
 
 namespace cc {
 
diff --git a/cc/debug/test_context_provider.h b/cc/test/test_context_provider.h
index ab753102..2c64fe5 100644
--- a/cc/debug/test_context_provider.h
+++ b/cc/test/test_context_provider.h
@@ -2,24 +2,22 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CC_DEBUG_TEST_CONTEXT_PROVIDER_H_
-#define CC_DEBUG_TEST_CONTEXT_PROVIDER_H_
+#ifndef CC_TEST_TEST_CONTEXT_PROVIDER_H_
+#define CC_TEST_TEST_CONTEXT_PROVIDER_H_
 
 #include "base/callback.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/synchronization/lock.h"
 #include "base/threading/thread_checker.h"
-#include "cc/base/cc_export.h"
-#include "cc/debug/test_context_support.h"
 #include "cc/output/context_provider.h"
+#include "cc/test/test_context_support.h"
 
 namespace WebKit { class WebGraphicsContext3D; }
 
 namespace cc {
 class TestWebGraphicsContext3D;
 
-class CC_EXPORT TestContextProvider
-    : public NON_EXPORTED_BASE(cc::ContextProvider) {
+class TestContextProvider : public cc::ContextProvider {
  public:
   typedef base::Callback<scoped_ptr<TestWebGraphicsContext3D>(void)>
     CreateCallback;
@@ -55,7 +53,7 @@ class CC_EXPORT TestContextProvider
   void SetMaxTransferBufferUsageBytes(size_t max_transfer_buffer_usage_bytes);
 
  protected:
-  TestContextProvider(scoped_ptr<TestWebGraphicsContext3D> context);
+  explicit TestContextProvider(scoped_ptr<TestWebGraphicsContext3D> context);
   virtual ~TestContextProvider();
 
   void OnLostContext();
@@ -86,5 +84,5 @@ class CC_EXPORT TestContextProvider
 
 }  // namespace cc
 
-#endif  // CC_DEBUG_TEST_CONTEXT_PROVIDER_H_
+#endif  // CC_TEST_TEST_CONTEXT_PROVIDER_H_
 
diff --git a/cc/debug/test_context_support.cc b/cc/test/test_context_support.cc
index e5a0b93..d71f74d 100644
--- a/cc/debug/test_context_support.cc
+++ b/cc/test/test_context_support.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/debug/test_context_support.h"
+#include "cc/test/test_context_support.h"
 
 #include "base/message_loop/message_loop.h"
 
diff --git a/cc/debug/test_context_support.h b/cc/test/test_context_support.h
index 067bcaf..6c2258e 100644
--- a/cc/debug/test_context_support.h
+++ b/cc/test/test_context_support.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_DEBUG_TEST_CONTEXT_SUPPORT_H_
-#define CC_DEBUG_TEST_CONTEXT_SUPPORT_H_
+#ifndef CC_TEST_TEST_CONTEXT_SUPPORT_H_
+#define CC_TEST_TEST_CONTEXT_SUPPORT_H_
 
 #include <vector>
 
@@ -34,4 +34,4 @@ class TestContextSupport : public gpu::ContextSupport {
 
 }  // namespace cc
 
-#endif  // CC_DEBUG_TEST_CONTEXT_SUPPORT_H_
+#endif  // CC_TEST_TEST_CONTEXT_SUPPORT_H_
diff --git a/cc/debug/test_texture.cc b/cc/test/test_texture.cc
index 5ab84a4..f68f5a6 100644
--- a/cc/debug/test_texture.cc
+++ b/cc/test/test_texture.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/debug/test_texture.h"
+#include "cc/test/test_texture.h"
 
 #include "third_party/khronos/GLES2/gl2.h"
 
diff --git a/cc/debug/test_texture.h b/cc/test/test_texture.h
index 301c3a4..a286468 100644
--- a/cc/debug/test_texture.h
+++ b/cc/test/test_texture.h
@@ -2,21 +2,20 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#ifndef CC_TEST_TEST_TEXTURE_H_
+#define CC_TEST_TEST_TEXTURE_H_
+
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
-#include "cc/base/cc_export.h"
 #include "cc/resources/resource_format.h"
 #include "third_party/WebKit/public/platform/WebGraphicsContext3D.h"
-#include "ui/gfx/rect.h"
-
-#ifndef CC_DEBUG_TEST_TEXTURE_H_
-#define CC_DEBUG_TEST_TEXTURE_H_
+#include "ui/gfx/size.h"
 
 namespace cc {
 
-size_t CC_EXPORT TextureSizeBytes(gfx::Size size, ResourceFormat format);
+size_t TextureSizeBytes(gfx::Size size, ResourceFormat format);
 
-struct CC_EXPORT TestTexture : public base::RefCounted<TestTexture> {
+struct TestTexture : public base::RefCounted<TestTexture> {
   TestTexture();
 
   void Reallocate(gfx::Size size, ResourceFormat format);
@@ -36,4 +35,4 @@ struct CC_EXPORT TestTexture : public base::RefCounted<TestTexture> {
 
 }  // namespace cc
 
-#endif  // CC_DEBUG_TEST_TEXTURE_H_
+#endif  // CC_TEST_TEST_TEXTURE_H_
diff --git a/cc/debug/test_web_graphics_context_3d.cc b/cc/test/test_web_graphics_context_3d.cc
index 4135ba0..0c15f20 100644
--- a/cc/debug/test_web_graphics_context_3d.cc
+++ b/cc/test/test_web_graphics_context_3d.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/debug/test_web_graphics_context_3d.h"
+#include "cc/test/test_web_graphics_context_3d.h"
 
 #include <algorithm>
 #include <string>
@@ -11,7 +11,7 @@
 #include "base/lazy_instance.h"
 #include "base/logging.h"
 #include "base/message_loop/message_loop.h"
-#include "cc/debug/test_context_support.h"
+#include "cc/test/test_context_support.h"
 #include "gpu/GLES2/gl2extchromium.h"
 #include "third_party/khronos/GLES2/gl2ext.h"
 
diff --git a/cc/debug/test_web_graphics_context_3d.h b/cc/test/test_web_graphics_context_3d.h
index 48ee70f..796e34d 100644
--- a/cc/debug/test_web_graphics_context_3d.h
+++ b/cc/test/test_web_graphics_context_3d.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_DEBUG_TEST_WEB_GRAPHICS_CONTEXT_3D_H_
-#define CC_DEBUG_TEST_WEB_GRAPHICS_CONTEXT_3D_H_
+#ifndef CC_TEST_TEST_WEB_GRAPHICS_CONTEXT_3D_H_
+#define CC_TEST_TEST_WEB_GRAPHICS_CONTEXT_3D_H_
 
 #include <vector>
 
@@ -15,17 +15,16 @@
 #include "base/memory/weak_ptr.h"
 #include "base/stl_util.h"
 #include "base/synchronization/lock.h"
-#include "cc/base/cc_export.h"
-#include "cc/debug/fake_web_graphics_context_3d.h"
-#include "cc/debug/ordered_texture_map.h"
-#include "cc/debug/test_texture.h"
 #include "cc/output/context_provider.h"
+#include "cc/test/fake_web_graphics_context_3d.h"
+#include "cc/test/ordered_texture_map.h"
+#include "cc/test/test_texture.h"
 #include "third_party/khronos/GLES2/gl2.h"
 
 namespace cc {
 class TestContextSupport;
 
-class CC_EXPORT TestWebGraphicsContext3D : public FakeWebGraphicsContext3D {
+class TestWebGraphicsContext3D : public FakeWebGraphicsContext3D {
  public:
   static scoped_ptr<TestWebGraphicsContext3D> Create();
 
@@ -320,4 +319,4 @@ class CC_EXPORT TestWebGraphicsContext3D : public FakeWebGraphicsContext3D {
 
 }  // namespace cc
 
-#endif  // CC_DEBUG_TEST_WEB_GRAPHICS_CONTEXT_3D_H_
+#endif  // CC_TEST_TEST_WEB_GRAPHICS_CONTEXT_3D_H_
diff --git a/cc/trees/layer_tree_host_impl_unittest.cc b/cc/trees/layer_tree_host_impl_unittest.cc
index 18b273e..7fa2d10 100644
--- a/cc/trees/layer_tree_host_impl_unittest.cc
+++ b/cc/trees/layer_tree_host_impl_unittest.cc
@@ -12,7 +12,6 @@
 #include "base/containers/scoped_ptr_hash_map.h"
 #include "cc/animation/scrollbar_animation_controller_thinning.h"
 #include "cc/base/math_util.h"
-#include "cc/debug/test_web_graphics_context_3d.h"
 #include "cc/input/top_controls_manager.h"
 #include "cc/layers/delegated_renderer_layer_impl.h"
 #include "cc/layers/heads_up_display_layer_impl.h"
@@ -48,6 +47,7 @@
 #include "cc/test/geometry_test_utils.h"
 #include "cc/test/layer_test_common.h"
 #include "cc/test/render_pass_test_common.h"
+#include "cc/test/test_web_graphics_context_3d.h"
 #include "cc/trees/layer_tree_impl.h"
 #include "cc/trees/single_thread_proxy.h"
 #include "media/base/media.h"
diff --git a/cc/trees/layer_tree_host_unittest.cc b/cc/trees/layer_tree_host_unittest.cc
index 950fd79..13467cb 100644
--- a/cc/trees/layer_tree_host_unittest.cc
+++ b/cc/trees/layer_tree_host_unittest.cc
@@ -10,7 +10,6 @@
 #include "base/synchronization/lock.h"
 #include "cc/animation/timing_function.h"
 #include "cc/debug/frame_rate_counter.h"
-#include "cc/debug/test_web_graphics_context_3d.h"
 #include "cc/layers/content_layer.h"
 #include "cc/layers/content_layer_client.h"
 #include "cc/layers/io_surface_layer.h"
@@ -41,6 +40,7 @@
 #include "cc/test/geometry_test_utils.h"
 #include "cc/test/layer_tree_test.h"
 #include "cc/test/occlusion_tracker_test_common.h"
+#include "cc/test/test_web_graphics_context_3d.h"
 #include "cc/trees/layer_tree_host_impl.h"
 #include "cc/trees/layer_tree_impl.h"
 #include "cc/trees/single_thread_proxy.h"
diff --git a/cc/trees/layer_tree_host_unittest_context.cc b/cc/trees/layer_tree_host_unittest_context.cc
index 03b8d7f..76a7eab 100644
--- a/cc/trees/layer_tree_host_unittest_context.cc
+++ b/cc/trees/layer_tree_host_unittest_context.cc
@@ -5,8 +5,6 @@
 #include "cc/trees/layer_tree_host.h"
 
 #include "base/basictypes.h"
-#include "cc/debug/test_context_provider.h"
-#include "cc/debug/test_web_graphics_context_3d.h"
 #include "cc/layers/content_layer.h"
 #include "cc/layers/delegated_frame_provider.h"
 #include "cc/layers/delegated_frame_resource_collection.h"
@@ -34,6 +32,8 @@
 #include "cc/test/fake_video_frame_provider.h"
 #include "cc/test/layer_tree_test.h"
 #include "cc/test/render_pass_test_common.h"
+#include "cc/test/test_context_provider.h"
+#include "cc/test/test_web_graphics_context_3d.h"
 #include "cc/trees/layer_tree_host_impl.h"
 #include "cc/trees/layer_tree_impl.h"
 #include "cc/trees/single_thread_proxy.h"
diff --git a/content/content_tests.gypi b/content/content_tests.gypi
index a5f67d2..479ad99 100644
--- a/content/content_tests.gypi
+++ b/content/content_tests.gypi
@@ -216,6 +216,7 @@
             'content.gyp:content_renderer',
             'content.gyp:content_utility',
             'content.gyp:content_worker',
+            '../cc/cc_tests.gyp:cc_test_support',
             '../media/media.gyp:media',
             '../ppapi/ppapi_internal.gyp:ppapi_host',
             '../ppapi/ppapi_internal.gyp:ppapi_proxy',
diff --git a/content/test/web_layer_tree_view_impl_for_testing.cc b/content/test/web_layer_tree_view_impl_for_testing.cc
index 7545795..64be748 100644
--- a/content/test/web_layer_tree_view_impl_for_testing.cc
+++ b/content/test/web_layer_tree_view_impl_for_testing.cc
@@ -8,10 +8,10 @@
 #include "base/strings/string_number_conversions.h"
 #include "base/synchronization/lock.h"
 #include "cc/base/switches.h"
-#include "cc/debug/test_context_provider.h"
 #include "cc/input/input_handler.h"
 #include "cc/layers/layer.h"
 #include "cc/output/output_surface.h"
+#include "cc/test/test_context_provider.h"
 #include "cc/trees/layer_tree_host.h"
 #include "content/test/test_webkit_platform_support.h"
 #include "third_party/WebKit/public/platform/Platform.h"
diff --git a/ui/compositor/compositor.gyp b/ui/compositor/compositor.gyp
index 5c6291f..2da4195 100644
--- a/ui/compositor/compositor.gyp
+++ b/ui/compositor/compositor.gyp
@@ -78,6 +78,7 @@
       'dependencies': [
         '<(DEPTH)/base/base.gyp:base',
         '<(DEPTH)/cc/cc.gyp:cc',
+        '<(DEPTH)/cc/cc_tests.gyp:cc_test_support',
         '<(DEPTH)/skia/skia.gyp:skia',
         '<(DEPTH)/third_party/WebKit/public/blink.gyp:blink_minimal',
         '<(DEPTH)/ui/events/events.gyp:events',
@@ -107,7 +108,7 @@
         '<(DEPTH)/base/base.gyp:base',
         '<(DEPTH)/base/base.gyp:test_support_base',
         '<(DEPTH)/cc/cc.gyp:cc',
-        '<(DEPTH)/cc/cc_tests.gyp:cc_test_utils',
+        '<(DEPTH)/cc/cc_tests.gyp:cc_test_support',
         '<(DEPTH)/skia/skia.gyp:skia',
         '<(DEPTH)/testing/gtest.gyp:gtest',
         '<(DEPTH)/ui/events/events.gyp:events',
diff --git a/ui/compositor/test/test_context_factory.cc b/ui/compositor/test/test_context_factory.cc
index 30f84fb..d47dec9 100644
--- a/ui/compositor/test/test_context_factory.cc
+++ b/ui/compositor/test/test_context_factory.cc
@@ -4,8 +4,8 @@
 
 #include "ui/compositor/test/test_context_factory.h"
 
-#include "cc/debug/test_context_provider.h"
 #include "cc/output/output_surface.h"
+#include "cc/test/test_context_provider.h"
 #include "ui/compositor/reflector.h"
 
 namespace ui {