Move CC switches to cc/switches.h.

cc/settings.h

Index: cc/settings.h
diff --git a/cc/settings.h b/cc/settings.h
index cde48caa2a453c2c2b79f2b3ff721036ce370a91..c6066529b9a7fea071dfd1c93cf27a47565de9a1 100644
--- a/cc/settings.h
+++ b/cc/settings.h
@@ -5,7 +5,7 @@
 #ifndef CCSettings_h
 #define CCSettings_h
 
-#include "IntSize.h"
+#include "webkit/glue/webkit_glue_export.h"
 
 namespace cc {
 
@@ -13,28 +13,23 @@ namespace cc {
 // CCLayerTreeSettings if a ui and renderer compositor might not want the same
 // setting.
 
-class CCSettings {
+class Settings {
 public:
     static bool perTilePaintingEnabled();
     static bool partialSwapEnabled();
     static bool acceleratedAnimationEnabled();
     static bool pageScalePinchZoomEnabled();
-
     static bool jankInsteadOfCheckerboard();
     static bool backgroundColorInsteadOfCheckerboard();
 
-    // These setters should only be used on the main thread before the layer
-    // renderer is initialized.
-    static void setPerTilePaintingEnabled(bool);
     static void setPartialSwapEnabled(bool);
+    static void setPerTilePaintingEnabled(bool);
     static void setAcceleratedAnimationEnabled(bool);
     static void setPageScalePinchZoomEnabled(bool);
 
-    // These settings are meant to be set only once, and only read thereafter.
-    // This function is only for resetting settings in tests.
-    static void reset();
+    static void resetForTest();
 };
 
 } // namespace cc
 
-#endif // CCSettings_h
+#endif // Settings_h