cc: handling debug settings in new LayerTreeDebugState structure

ui/compositor/compositor.cc

Index: ui/compositor/compositor.cc
diff --git a/ui/compositor/compositor.cc b/ui/compositor/compositor.cc
index 2350bdafcb3df3e060b29fa8268902e9436e9db7..a36e96b916f4fc372d886e2ad0e75d9089dd7ae6 100644
--- a/ui/compositor/compositor.cc
+++ b/ui/compositor/compositor.cc
@@ -300,11 +300,13 @@ Compositor::Compositor(CompositorDelegate* delegate,
 
   CommandLine* command_line = CommandLine::ForCurrentProcess();
   cc::LayerTreeSettings settings;
-  settings.showPlatformLayerTree =
+  settings.initialDebugState.showFPSCounter =
+      command_line->HasSwitch(switches::kUIShowFPSCounter);
+  settings.initialDebugState.showPlatformLayerTree =
       command_line->HasSwitch(switches::kUIShowLayerTree);
   settings.refreshRate =
       test_compositor_enabled ? kTestRefreshRate : kDefaultRefreshRate;
-  settings.showDebugBorders =
+  settings.initialDebugState.showDebugBorders =
       command_line->HasSwitch(switches::kUIShowLayerBorders);
   settings.partialSwapEnabled =
       command_line->HasSwitch(switches::kUIEnablePartialSwap);
@@ -318,8 +320,6 @@ Compositor::Compositor(CompositorDelegate* delegate,
   }
 
   host_ = cc::LayerTreeHost::create(this, settings, thread.Pass());
-  host_->setShowFPSCounter(
-      command_line->HasSwitch(switches::kUIShowFPSCounter));
   host_->setRootLayer(root_web_layer_);
   host_->setSurfaceReady();
 }