Pinch/Zoom Infrastructure & Plumbing CL

cc/trees/layer_tree_host_unittest_context.cc

Index: cc/trees/layer_tree_host_unittest_context.cc
diff --git a/cc/trees/layer_tree_host_unittest_context.cc b/cc/trees/layer_tree_host_unittest_context.cc
index ab6e93ee4b04906042ace954b4414523e22d8ba1..30f41dee087978ed2da57a4844f84b79f59eab8c 100644
--- a/cc/trees/layer_tree_host_unittest_context.cc
+++ b/cc/trees/layer_tree_host_unittest_context.cc
@@ -1243,7 +1243,7 @@ class LayerTreeHostContextTestDontUseLostResources
 
     scoped_refptr<PaintedScrollbarLayer> scrollbar =
         PaintedScrollbarLayer::Create(
-            scoped_ptr<Scrollbar>(new FakeScrollbar).Pass(), content->id());
+            scoped_ptr<Scrollbar>(new FakeScrollbar).Pass(), content.get());  // WJM
     scrollbar->SetBounds(gfx::Size(10, 10));
     scrollbar->SetAnchorPoint(gfx::PointF());
     scrollbar->SetIsDrawable(true);
@@ -1673,7 +1673,7 @@ class ScrollbarLayerLostContext : public LayerTreeHostContextTest {
   virtual void BeginTest() OVERRIDE {
     scoped_refptr<Layer> scroll_layer = Layer::Create();
     scrollbar_layer_ = FakePaintedScrollbarLayer::Create(
-        false, true, scroll_layer->id());
+        false, true, scroll_layer.get());                        // WJM
     scrollbar_layer_->SetBounds(gfx::Size(10, 100));
     layer_tree_host()->root_layer()->AddChild(scrollbar_layer_);
     layer_tree_host()->root_layer()->AddChild(scroll_layer);