Update from https://crrev.com/315085

cc/blink/web_layer_impl.h

Index: cc/blink/web_layer_impl.h
diff --git a/cc/blink/web_layer_impl.h b/cc/blink/web_layer_impl.h
index 111c6cf703ea5000cc9c36085b6b705ca6db809e..787f63201cf97166ebe6f51954f4e84c2f4473c9 100644
--- a/cc/blink/web_layer_impl.h
+++ b/cc/blink/web_layer_impl.h
@@ -31,10 +31,16 @@ struct WebFloatRect;
 }
 
 namespace base {
-namespace debug {
+namespace trace_event {
 class ConvertableToTraceFormat;
 }
+
+// TODO(ssid): remove these aliases after the tracing clients are moved to the
+// new trace_event namespace. See crbug.com/451032. ETA: March 2015.
+namespace debug {
+using ::base::trace_event::ConvertableToTraceFormat;
 }
+}  // namespace base
 
 namespace cc {
 class Layer;
@@ -123,6 +129,8 @@ class WebLayerImpl : public blink::WebLayer, public cc::LayerClient {
   virtual void setTouchEventHandlerRegion(
       const blink::WebVector<blink::WebRect>& region);
   virtual blink::WebVector<blink::WebRect> touchEventHandlerRegion() const;
+  virtual void setScrollBlocksOn(blink::WebScrollBlocksOn);
+  virtual blink::WebScrollBlocksOn scrollBlocksOn() const;
   virtual void setIsContainerForFixedPositionLayers(bool is_container);
   virtual bool isContainerForFixedPositionLayers() const;
   virtual void setPositionConstraint(