Revert of Pinch/Zoom Infrastructure & Plumbing CL

cc/trees/layer_tree_host_perftest.cc

Index: cc/trees/layer_tree_host_perftest.cc
diff --git a/cc/trees/layer_tree_host_perftest.cc b/cc/trees/layer_tree_host_perftest.cc
index d8da0a0ec96b341cbfe49c7bf2a706fad266e52c..1bfe1c49d9e3ba36a7071bb6b457a17bf15fa1dc 100644
--- a/cc/trees/layer_tree_host_perftest.cc
+++ b/cc/trees/layer_tree_host_perftest.cc
@@ -338,21 +338,6 @@
     layer_tree_host()->SetPageScaleFactorAndLimits(1.f, min_scale_, max_scale_);
   }
 
-  virtual void BuildTree() OVERRIDE {
-    LayerTreeHostPerfTestJsonReader::BuildTree();
-
-    // TODO(wjmaclean) The JSON tree reader should be able to mark inner/out
-    // viewport scroll layers as part of its tree setup. The code below is
-    // matched to the tree specified in the data file heavy_layer_tree.
-    Layer* root = layer_tree_host()->root_layer();
-    Layer* clip_layer = root->children()[0];
-    Layer* inner_viewport_scroll_layer = clip_layer->children()[0];
-    inner_viewport_scroll_layer->SetScrollClipLayer(root);
-    inner_viewport_scroll_layer->SetIsContainerForFixedPositionLayers(true);
-    layer_tree_host()->RegisterViewportLayers(
-        root, inner_viewport_scroll_layer, 0);
-  }
-
   virtual void ApplyScrollAndScale(gfx::Vector2d scroll_delta,
                                    float scale_delta) OVERRIDE {
     float page_scale_factor = layer_tree_host()->page_scale_factor();