Remove scroll_clip_layer dependency from viewport layer tracking

cc/test/fake_layer_tree_host.cc

Index: cc/test/fake_layer_tree_host.cc
diff --git a/cc/test/fake_layer_tree_host.cc b/cc/test/fake_layer_tree_host.cc
index 77b94195c087352f4202ec97f5c1c2b79f059d07..46fa9319350ae40612abf8a2fb735de182df1b7f 100644
--- a/cc/test/fake_layer_tree_host.cc
+++ b/cc/test/fake_layer_tree_host.cc
@@ -82,7 +82,14 @@ LayerImpl* FakeLayerTreeHost::CommitAndCreateLayerImplTree() {
     active_tree()->SetViewportLayersFromIds(
         overscroll_elasticity_layer() ? overscroll_elasticity_layer()->id()
                                       : Layer::INVALID_ID,
-        page_scale_layer()->id(), inner_viewport_scroll_layer()->id(),
+        page_scale_layer()->id(),
+        inner_viewport_container_layer()
+            ? inner_viewport_container_layer()->id()
+            : Layer::INVALID_ID,
+        outer_viewport_container_layer()
+            ? outer_viewport_container_layer()->id()
+            : Layer::INVALID_ID,
+        inner_viewport_scroll_layer()->id(),
         outer_viewport_scroll_layer() ? outer_viewport_scroll_layer()->id()
                                       : Layer::INVALID_ID);
   }