Move CC switches to cc/switches.h.

ui/compositor/compositor.cc

Index: ui/compositor/compositor.cc
diff --git a/ui/compositor/compositor.cc b/ui/compositor/compositor.cc
index dbaac60941cbb24bc7e3e4833b2573b7cc6e5317..4ce14d94fd56c54af5377b4537600a444a9f9de0 100644
--- a/ui/compositor/compositor.cc
+++ b/ui/compositor/compositor.cc
@@ -8,6 +8,7 @@
 
 #include "base/command_line.h"
 #include "base/threading/thread_restrictions.h"
+#include "cc/settings.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "third_party/WebKit/Source/Platform/chromium/public/Platform.h"
 #include "third_party/WebKit/Source/Platform/chromium/public/WebCompositorSupport.h"
@@ -176,14 +177,14 @@ Compositor::~Compositor() {
 }
 
 void Compositor::Initialize(bool use_thread) {
-  CommandLine* command_line = CommandLine::ForCurrentProcess();
+  const CommandLine& command_line = *CommandLine::ForCurrentProcess();
+  cc::Settings::setPartialSwapEnabled(
+       command_line.HasSwitch(switches::kUIEnablePartialSwap));
+  cc::Settings::setPerTilePaintingEnabled(
+       command_line.HasSwitch(switches::kUIEnablePerTilePainting));
+
   WebKit::WebCompositorSupport* compositor_support =
       WebKit::Platform::current()->compositorSupport();
-  // These settings must be applied before we initialize the compositor.
-  compositor_support->setPartialSwapEnabled(
-      command_line->HasSwitch(switches::kUIEnablePartialSwap));
-  compositor_support->setPerTilePaintingEnabled(
-      command_line->HasSwitch(switches::kUIEnablePerTilePainting));
   if (use_thread)
     g_compositor_thread = new webkit_glue::WebThreadImpl("Browser Compositor");
   compositor_support->initialize(g_compositor_thread);