Remove transitional WEBLAYER_IS_PURE_VIRTUAL code

ui/compositor/layer.h

Index: ui/compositor/layer.h
diff --git a/ui/compositor/layer.h b/ui/compositor/layer.h
index a999de8e6dfc7ccc8b0767d705b4127a6d2d161d..2e064cee7db33b6475c595c1b0526086d4e3ec47 100644
--- a/ui/compositor/layer.h
+++ b/ui/compositor/layer.h
@@ -255,17 +255,9 @@ class COMPOSITOR_EXPORT Layer
   // WebContentLayerClient
   virtual void paintContents(WebKit::WebCanvas*,
                              const WebKit::WebRect& clip,
-#if defined(WEBCONTENTLAYERCLIENT_FLOAT_OPAQUE_RECT)
                              WebKit::WebFloatRect& opaque);
-#else
-                             WebKit::WebRect& opaque);
-#endif
 
-#if defined(WEBLAYER_IS_PURE_VIRTUAL)
   WebKit::WebLayer* web_layer() { return web_layer_; }
-#else
-  WebKit::WebLayer web_layer() { return web_layer_; }
-#endif
 
   float device_scale_factor() const { return device_scale_factor_; }
 
@@ -380,16 +372,12 @@ class COMPOSITOR_EXPORT Layer
 
   scoped_ptr<LayerAnimator> animator_;
 
-#if defined(WEBLAYER_IS_PURE_VIRTUAL)
   // Ownership of the layer is held through one of the strongly typed layer
   // pointers, depending on which sort of layer this is.
   scoped_ptr<WebKit::WebContentLayer> content_layer_;
   scoped_ptr<WebKit::WebExternalTextureLayer> texture_layer_;
   scoped_ptr<WebKit::WebSolidColorLayer> solid_color_layer_;
   WebKit::WebLayer* web_layer_;
-#else
-  WebKit::WebLayer web_layer_;
-#endif
   bool web_layer_is_accelerated_;
   bool show_debug_borders_;