Adjust compositing tests to be SPv2-compatible.

third_party/WebKit/LayoutTests/compositing/rendering-contexts-expected.txt

Index: third_party/WebKit/LayoutTests/compositing/rendering-contexts-expected.txt
diff --git a/third_party/WebKit/LayoutTests/compositing/rendering-contexts-expected.txt b/third_party/WebKit/LayoutTests/compositing/rendering-contexts-expected.txt
index bb0468aeba2b7709c89d1f9b5eefebde551b0b47..4963084e4dfb724e64730bec63f16cffacec81cd 100644
--- a/third_party/WebKit/LayoutTests/compositing/rendering-contexts-expected.txt
+++ b/third_party/WebKit/LayoutTests/compositing/rendering-contexts-expected.txt
@@ -1,45 +1,37 @@
 {
-  "name": "Content Root Layer",
-  "bounds": [800, 600],
-  "children": [
+  "layers": [
     {
       "name": "LayoutView #document",
       "bounds": [800, 600],
       "contentsOpaque": true,
+      "drawsContent": true
+    },
+    {
+      "name": "LayoutBlockFlow DIV id='grandparent' class='composited'",
+      "position": [8, 8],
+      "bounds": [100, 100],
+      "contentsOpaque": true,
+      "shouldFlattenTransform": false,
+      "3dRenderingContext": 1,
+      "drawsContent": true,
+      "backgroundColor": "#008000"
+    },
+    {
+      "name": "LayoutBlockFlow DIV id='parent' class='composited'",
+      "bounds": [100, 100],
+      "contentsOpaque": true,
+      "3dRenderingContext": 1,
+      "drawsContent": true,
+      "backgroundColor": "#008000"
+    },
+    {
+      "name": "LayoutBlockFlow DIV id='child' class='composited'",
+      "bounds": [100, 100],
+      "contentsOpaque": true,
+      "shouldFlattenTransform": false,
+      "3dRenderingContext": 2,
       "drawsContent": true,
-      "children": [
-        {
-          "name": "LayoutBlockFlow DIV id='grandparent' class='composited'",
-          "position": [8, 8],
-          "bounds": [100, 100],
-          "contentsOpaque": true,
-          "shouldFlattenTransform": false,
-          "3dRenderingContext": 1,
-          "drawsContent": true,
-          "backgroundColor": "#008000",
-          "children": [
-            {
-              "name": "LayoutBlockFlow DIV id='parent' class='composited'",
-              "bounds": [100, 100],
-              "contentsOpaque": true,
-              "3dRenderingContext": 1,
-              "drawsContent": true,
-              "backgroundColor": "#008000",
-              "children": [
-                {
-                  "name": "LayoutBlockFlow DIV id='child' class='composited'",
-                  "bounds": [100, 100],
-                  "contentsOpaque": true,
-                  "shouldFlattenTransform": false,
-                  "3dRenderingContext": 2,
-                  "drawsContent": true,
-                  "backgroundColor": "#008000"
-                }
-              ]
-            }
-          ]
-        }
-      ]
+      "backgroundColor": "#008000"
     }
   ]
 }