Move CC switches to cc/switches.h.

cc/layer_tree_host_impl_unittest.cc

Index: cc/layer_tree_host_impl_unittest.cc
diff --git a/cc/layer_tree_host_impl_unittest.cc b/cc/layer_tree_host_impl_unittest.cc
index 9f0b3c4c918fc08a0a5aeee356c2e98a1f0c1b67..da5d55ca4d31071ab2c6110517c8b057416d3aa2 100644
--- a/cc/layer_tree_host_impl_unittest.cc
+++ b/cc/layer_tree_host_impl_unittest.cc
@@ -24,6 +24,7 @@
 #include "CCTileDrawQuad.h"
 #include "CCTiledLayerImpl.h"
 #include "CCVideoLayerImpl.h"
+#include "base/command_line.h"
 #include "base/hash_tables.h"
 #include "cc/test/animation_test_common.h"
 #include "cc/test/fake_web_compositor_output_surface.h"
@@ -66,7 +67,7 @@ public:
 
     virtual void SetUp()
     {
-        CCSettings::setPageScalePinchZoomEnabled(GetParam());
+        CCSettings::setPageScalePinchZoomEnabledForTest(GetParam());
         CCLayerTreeSettings settings;
         settings.minimumOcclusionTrackingSize = IntSize();
 
@@ -77,7 +78,6 @@ public:
 
     virtual void TearDown()
     {
-        CCSettings::reset();
     }
 
     virtual void didLoseContextOnImplThread() OVERRIDE { }
@@ -93,7 +93,7 @@ public:
 
     scoped_ptr<CCLayerTreeHostImpl> createLayerTreeHost(bool partialSwap, scoped_ptr<CCGraphicsContext> graphicsContext, scoped_ptr<CCLayerImpl> root)
     {
-        CCSettings::setPartialSwapEnabled(partialSwap);
+        CCSettings::setPartialSwapEnabledForTest(partialSwap);
 
         CCLayerTreeSettings settings;
         settings.minimumOcclusionTrackingSize = IntSize();
@@ -1940,7 +1940,7 @@ TEST_P(CCLayerTreeHostImplTest, partialSwapReceivesDamageRect)
     // This test creates its own CCLayerTreeHostImpl, so
     // that we can force partial swap enabled.
     CCLayerTreeSettings settings;
-    CCSettings::setPartialSwapEnabled(true);
+    CCSettings::setPartialSwapEnabledForTest(true);
     scoped_ptr<CCLayerTreeHostImpl> layerTreeHostImpl = CCLayerTreeHostImpl::create(settings, this);
     layerTreeHostImpl->initializeRenderer(ccContext.Pass());
     layerTreeHostImpl->setViewportSize(IntSize(500, 500), IntSize(500, 500));
@@ -2223,7 +2223,7 @@ public:
 
 static scoped_ptr<CCLayerTreeHostImpl> setupLayersForOpacity(bool partialSwap, CCLayerTreeHostImplClient* client)
 {
-    CCSettings::setPartialSwapEnabled(partialSwap);
+    CCSettings::setPartialSwapEnabledForTest(partialSwap);
 
     scoped_ptr<CCGraphicsContext> context = FakeWebCompositorOutputSurface::create(adoptPtr(new PartialSwapContext)).PassAs<CCGraphicsContext>();
 
@@ -2988,7 +2988,7 @@ public:
 
 TEST_P(CCLayerTreeHostImplTest, textureCachingWithClipping)
 {
-    CCSettings::setPartialSwapEnabled(true);
+    CCSettings::setPartialSwapEnabledForTest(true);
 
     CCLayerTreeSettings settings;
     settings.minimumOcclusionTrackingSize = IntSize();
@@ -3085,7 +3085,7 @@ TEST_P(CCLayerTreeHostImplTest, textureCachingWithClipping)
 
 TEST_P(CCLayerTreeHostImplTest, textureCachingWithOcclusion)
 {
-    CCSettings::setPartialSwapEnabled(false);
+    CCSettings::setPartialSwapEnabledForTest(false);
 
     CCLayerTreeSettings settings;
     settings.minimumOcclusionTrackingSize = IntSize();
@@ -3201,7 +3201,7 @@ TEST_P(CCLayerTreeHostImplTest, textureCachingWithOcclusion)
 
 TEST_P(CCLayerTreeHostImplTest, textureCachingWithOcclusionEarlyOut)
 {
-    CCSettings::setPartialSwapEnabled(false);
+    CCSettings::setPartialSwapEnabledForTest(false);
 
     CCLayerTreeSettings settings;
     settings.minimumOcclusionTrackingSize = IntSize();
@@ -3317,7 +3317,7 @@ TEST_P(CCLayerTreeHostImplTest, textureCachingWithOcclusionEarlyOut)
 
 TEST_P(CCLayerTreeHostImplTest, textureCachingWithOcclusionExternalOverInternal)
 {
-    CCSettings::setPartialSwapEnabled(false);
+    CCSettings::setPartialSwapEnabledForTest(false);
 
     CCLayerTreeSettings settings;
     settings.minimumOcclusionTrackingSize = IntSize();
@@ -3406,7 +3406,7 @@ TEST_P(CCLayerTreeHostImplTest, textureCachingWithOcclusionExternalOverInternal)
 
 TEST_P(CCLayerTreeHostImplTest, textureCachingWithOcclusionExternalNotAligned)
 {
-    CCSettings::setPartialSwapEnabled(false);
+    CCSettings::setPartialSwapEnabledForTest(false);
 
     CCLayerTreeSettings settings;
     scoped_ptr<CCLayerTreeHostImpl> myHostImpl = CCLayerTreeHostImpl::create(settings, this);
@@ -3480,7 +3480,7 @@ TEST_P(CCLayerTreeHostImplTest, textureCachingWithOcclusionExternalNotAligned)
 
 TEST_P(CCLayerTreeHostImplTest, textureCachingWithOcclusionPartialSwap)
 {
-    CCSettings::setPartialSwapEnabled(true);
+    CCSettings::setPartialSwapEnabledForTest(true);
 
     CCLayerTreeSettings settings;
     settings.minimumOcclusionTrackingSize = IntSize();
@@ -3593,7 +3593,7 @@ TEST_P(CCLayerTreeHostImplTest, textureCachingWithOcclusionPartialSwap)
 
 TEST_P(CCLayerTreeHostImplTest, textureCachingWithScissor)
 {
-    CCSettings::setPartialSwapEnabled(false);
+    CCSettings::setPartialSwapEnabledForTest(false);
 
     CCLayerTreeSettings settings;
     settings.minimumOcclusionTrackingSize = IntSize();
@@ -3700,7 +3700,7 @@ TEST_P(CCLayerTreeHostImplTest, textureCachingWithScissor)
 
 TEST_P(CCLayerTreeHostImplTest, surfaceTextureCaching)
 {
-    CCSettings::setPartialSwapEnabled(true);
+    CCSettings::setPartialSwapEnabledForTest(true);
 
     CCLayerTreeSettings settings;
     settings.minimumOcclusionTrackingSize = IntSize();
@@ -3861,7 +3861,7 @@ TEST_P(CCLayerTreeHostImplTest, surfaceTextureCaching)
 
 TEST_P(CCLayerTreeHostImplTest, surfaceTextureCachingNoPartialSwap)
 {
-    CCSettings::setPartialSwapEnabled(false);
+    CCSettings::setPartialSwapEnabledForTest(false);
 
     CCLayerTreeSettings settings;
     settings.minimumOcclusionTrackingSize = IntSize();