cc: Remove racy initialization code in cc/base/switches.cc.

webkit/renderer/compositor_bindings/web_image_layer_impl.cc

Index: webkit/renderer/compositor_bindings/web_image_layer_impl.cc
diff --git a/webkit/renderer/compositor_bindings/web_image_layer_impl.cc b/webkit/renderer/compositor_bindings/web_image_layer_impl.cc
index 2074d05dbd0f66e074c2d771c2e78954b844a2d8..c3ae4aad4559a2505663872e03e3cb616259a670 100644
--- a/webkit/renderer/compositor_bindings/web_image_layer_impl.cc
+++ b/webkit/renderer/compositor_bindings/web_image_layer_impl.cc
@@ -4,21 +4,15 @@
 
 #include "webkit/renderer/compositor_bindings/web_image_layer_impl.h"
 
-#include "base/command_line.h"
-#include "cc/base/switches.h"
 #include "cc/layers/image_layer.h"
 #include "cc/layers/picture_image_layer.h"
 #include "webkit/renderer/compositor_bindings/web_layer_impl.h"
 #include "webkit/renderer/compositor_bindings/web_layer_impl_fixed_bounds.h"
 
-static bool usingPictureLayer() {
-  return cc::switches::IsImplSidePaintingEnabled();
-}
-
 namespace webkit {
 
 WebImageLayerImpl::WebImageLayerImpl() {
-  if (usingPictureLayer())
+  if (WebLayerImpl::UsingPictureLayer())
     layer_.reset(new WebLayerImplFixedBounds(cc::PictureImageLayer::Create()));
   else
     layer_.reset(new WebLayerImpl(cc::ImageLayer::Create()));
@@ -29,7 +23,7 @@ WebImageLayerImpl::~WebImageLayerImpl() {}
 blink::WebLayer* WebImageLayerImpl::layer() { return layer_.get(); }
 
 void WebImageLayerImpl::setBitmap(SkBitmap bitmap) {
-  if (usingPictureLayer()) {
+  if (WebLayerImpl::UsingPictureLayer()) {
     static_cast<cc::PictureImageLayer*>(layer_->layer())->SetBitmap(bitmap);
     static_cast<WebLayerImplFixedBounds*>(layer_.get())->SetFixedBounds(
         gfx::Size(bitmap.width(), bitmap.height()));