Move cc::DisplayItemList and related classes into cc/paint/

cc/base/switches.h

Index: cc/base/switches.h
diff --git a/cc/base/switches.h b/cc/base/switches.h
index 1bd124c1f0b61ceb9a12c6ef9cfdc71e18dcc55d..b723477bc36ccc10e919ac01c02d5b560896fdd0 100644
--- a/cc/base/switches.h
+++ b/cc/base/switches.h
@@ -7,7 +7,7 @@
 #ifndef CC_BASE_SWITCHES_H_
 #define CC_BASE_SWITCHES_H_
 
-#include "cc/base/cc_export.h"
+#include "cc/base/base_export.h"
 
 // Since cc is used from the render process, anything that goes here also needs
 // to be added to render_process_host_impl.cc.
@@ -16,44 +16,44 @@ namespace cc {
 namespace switches {
 
 // Switches for the renderer compositor only.
-CC_EXPORT extern const char kDisableThreadedAnimation[];
-CC_EXPORT extern const char kDisableCompositedAntialiasing[];
-CC_EXPORT extern const char kDisableMainFrameBeforeActivation[];
-CC_EXPORT extern const char kEnableCheckerImaging[];
-CC_EXPORT extern const char kEnableMainFrameBeforeActivation[];
-CC_EXPORT extern const char kBrowserControlsHideThreshold[];
-CC_EXPORT extern const char kBrowserControlsShowThreshold[];
-CC_EXPORT extern const char kSlowDownRasterScaleFactor[];
-CC_EXPORT extern const char kStrictLayerPropertyChangeChecking[];
-CC_EXPORT extern const char kEnableTileCompression[];
+CC_BASE_EXPORT extern const char kDisableThreadedAnimation[];
+CC_BASE_EXPORT extern const char kDisableCompositedAntialiasing[];
+CC_BASE_EXPORT extern const char kDisableMainFrameBeforeActivation[];
+CC_BASE_EXPORT extern const char kEnableMainFrameBeforeActivation[];
+CC_BASE_EXPORT extern const char kEnableCheckerImaging[];
+CC_BASE_EXPORT extern const char kBrowserControlsHideThreshold[];
+CC_BASE_EXPORT extern const char kBrowserControlsShowThreshold[];
+CC_BASE_EXPORT extern const char kSlowDownRasterScaleFactor[];
+CC_BASE_EXPORT extern const char kStrictLayerPropertyChangeChecking[];
+CC_BASE_EXPORT extern const char kEnableTileCompression[];
 
 // Switches for both the renderer and ui compositors.
-CC_EXPORT extern const char kEnableColorCorrectRendering[];
-CC_EXPORT extern const char kEnableGpuBenchmarking[];
-CC_EXPORT extern const char kEnableSurfaceSynchronization[];
+CC_BASE_EXPORT extern const char kEnableColorCorrectRendering[];
+CC_BASE_EXPORT extern const char kEnableGpuBenchmarking[];
+CC_BASE_EXPORT extern const char kEnableSurfaceSynchronization[];
 
 // Debug visualizations.
-CC_EXPORT extern const char kShowCompositedLayerBorders[];
-CC_EXPORT extern const char kUIShowCompositedLayerBorders[];
-CC_EXPORT extern const char kGlCompositedTextureQuadBorder[];
-CC_EXPORT extern const char kShowFPSCounter[];
-CC_EXPORT extern const char kUIShowFPSCounter[];
-CC_EXPORT extern const char kShowLayerAnimationBounds[];
-CC_EXPORT extern const char kUIShowLayerAnimationBounds[];
-CC_EXPORT extern const char kShowPropertyChangedRects[];
-CC_EXPORT extern const char kUIShowPropertyChangedRects[];
-CC_EXPORT extern const char kShowSurfaceDamageRects[];
-CC_EXPORT extern const char kUIShowSurfaceDamageRects[];
-CC_EXPORT extern const char kShowScreenSpaceRects[];
-CC_EXPORT extern const char kUIShowScreenSpaceRects[];
-CC_EXPORT extern const char kEnableLayerLists[];
-CC_EXPORT extern const char kUIEnableLayerLists[];
-CC_EXPORT extern const char kShowOverdrawFeedback[];
+CC_BASE_EXPORT extern const char kShowCompositedLayerBorders[];
+CC_BASE_EXPORT extern const char kUIShowCompositedLayerBorders[];
+CC_BASE_EXPORT extern const char kGlCompositedTextureQuadBorder[];
+CC_BASE_EXPORT extern const char kShowFPSCounter[];
+CC_BASE_EXPORT extern const char kUIShowFPSCounter[];
+CC_BASE_EXPORT extern const char kShowLayerAnimationBounds[];
+CC_BASE_EXPORT extern const char kUIShowLayerAnimationBounds[];
+CC_BASE_EXPORT extern const char kShowPropertyChangedRects[];
+CC_BASE_EXPORT extern const char kUIShowPropertyChangedRects[];
+CC_BASE_EXPORT extern const char kShowSurfaceDamageRects[];
+CC_BASE_EXPORT extern const char kUIShowSurfaceDamageRects[];
+CC_BASE_EXPORT extern const char kShowScreenSpaceRects[];
+CC_BASE_EXPORT extern const char kUIShowScreenSpaceRects[];
+CC_BASE_EXPORT extern const char kEnableLayerLists[];
+CC_BASE_EXPORT extern const char kUIEnableLayerLists[];
+CC_BASE_EXPORT extern const char kShowOverdrawFeedback[];
 
 // Unit test related.
-CC_EXPORT extern const char kCCLayerTreeTestNoTimeout[];
-CC_EXPORT extern const char kCCLayerTreeTestLongTimeout[];
-CC_EXPORT extern const char kCCRebaselinePixeltests[];
+CC_BASE_EXPORT extern const char kCCLayerTreeTestNoTimeout[];
+CC_BASE_EXPORT extern const char kCCLayerTreeTestLongTimeout[];
+CC_BASE_EXPORT extern const char kCCRebaselinePixeltests[];
 
 }  // namespace switches
 }  // namespace cc