Remove scroll_clip_layer dependency from viewport layer tracking

cc/trees/layer_tree_host_unittest.cc

Index: cc/trees/layer_tree_host_unittest.cc
diff --git a/cc/trees/layer_tree_host_unittest.cc b/cc/trees/layer_tree_host_unittest.cc
index b76093d6a3b90fac85362e838a530a826bffafbc..851220929b4575529dc304355962c168f055a397 100644
--- a/cc/trees/layer_tree_host_unittest.cc
+++ b/cc/trees/layer_tree_host_unittest.cc
@@ -4723,7 +4723,8 @@ class LayerTreeHostTestElasticOverscroll : public LayerTreeHostTest {
     layer_tree_host()->SetRootLayer(root_layer_);
     layer_tree_host()->RegisterViewportLayers(
         overscroll_elasticity_layer, page_scale_layer,
-        inner_viewport_scroll_layer, nullptr);
+        inner_viewport_container_layer, nullptr, inner_viewport_scroll_layer,
+        nullptr);
     LayerTreeHostTest::SetupTree();
     client_.set_bounds(content_layer->bounds());
   }
@@ -6127,8 +6128,8 @@ class LayerTreeHostTestCrispUpAfterPinchEnds : public LayerTreeHostTest {
     // pinch.
     pinch->AddChild(layer);
 
-    layer_tree_host()->RegisterViewportLayers(NULL, page_scale_layer, pinch,
-                                              nullptr);
+    layer_tree_host()->RegisterViewportLayers(NULL, page_scale_layer, root_clip,
+                                              nullptr, pinch, nullptr);
     layer_tree_host()->SetPageScaleFactorAndLimits(1.f, 1.f, 4.f);
     layer_tree_host()->SetRootLayer(root_clip);
     LayerTreeHostTest::SetupTree();
@@ -6431,8 +6432,8 @@ class LayerTreeHostTestContinuousDrawWhenCreatingVisibleTiles
     // pinch.
     pinch->AddChild(layer);
 
-    layer_tree_host()->RegisterViewportLayers(NULL, page_scale_layer, pinch,
-                                              nullptr);
+    layer_tree_host()->RegisterViewportLayers(NULL, page_scale_layer, root_clip,
+                                              nullptr, pinch, nullptr);
     layer_tree_host()->SetPageScaleFactorAndLimits(1.f, 1.f, 4.f);
     layer_tree_host()->SetRootLayer(root_clip);
     LayerTreeHostTest::SetupTree();
@@ -7392,10 +7393,13 @@ class LayerTreeTestPageScaleFlags : public LayerTreeTest {
     LayerTreeTest::SetupTree();
 
     scoped_refptr<Layer> overscroll_elasticity_layer = nullptr;
+    scoped_refptr<Layer> inner_viewport_container_layer = nullptr;
+    scoped_refptr<Layer> outer_viewport_container_layer = nullptr;
     scoped_refptr<Layer> inner_viewport_scroll_layer = nullptr;
     scoped_refptr<Layer> outer_viewport_scroll_layer = nullptr;
     layer_tree_host()->RegisterViewportLayers(
-        overscroll_elasticity_layer, page_scale, inner_viewport_scroll_layer,
+        overscroll_elasticity_layer, page_scale, inner_viewport_container_layer,
+        outer_viewport_container_layer, inner_viewport_scroll_layer,
         outer_viewport_scroll_layer);
 
     affected_by_page_scale_.push_back(page_scale->id());