[layoutng] Also accept LayoutNG objects in paint test regexes

I have to use N?G? instead of (NG)? because gtest does not support
the latter on Windows.

R=chrishtr@chromium.org

Change-Id: Ia62d1ec85447a351b8abc341203c3dcdc17fc63b
Reviewed-on: https://chromium-review.googlesource.com/c/1330695
Commit-Queue: Emil A Eklund <eae@chromium.org>
Reviewed-by: Emil A Eklund <eae@chromium.org>
Reviewed-by: Chris Harrelson <chrishtr@chromium.org>
Cr-Commit-Position: refs/heads/master@{#607053}

third_party/blink/renderer/core/paint/paint_and_raster_invalidation_test.cc

@@ -87,21 +87,23 @@ TEST_P(PaintAndRasterInvalidationTest, TrackingForTracing) {
 
     target->setAttribute(html_names::kStyleAttr, "height: 200px");
     UpdateAllLifecyclePhasesForTest();
-    EXPECT_THAT(get_debug_info(),
-                MatchesRegex(
-                    "\\{\"layer_name\":.*\"annotated_invalidation_rects\":\\["
-                    "\\{\"geometry_rect\":\\[8,108,100,100\\],"
-                    "\"reason\":\"incremental\","
-                    "\"client\":\"LayoutBlockFlow DIV id='target'\"\\}\\]\\}"));
+    EXPECT_THAT(
+        get_debug_info(),
+        MatchesRegex(
+            "\\{\"layer_name\":.*\"annotated_invalidation_rects\":\\["
+            "\\{\"geometry_rect\":\\[8,108,100,100\\],"
+            "\"reason\":\"incremental\","
+            "\"client\":\"LayoutN?G?BlockFlow DIV id='target'\"\\}\\]\\}"));
 
     target->setAttribute(html_names::kStyleAttr, "height: 200px; width: 200px");
     UpdateAllLifecyclePhasesForTest();
-    EXPECT_THAT(get_debug_info(),
-                MatchesRegex(
-                    "\\{\"layer_name\":.*\"annotated_invalidation_rects\":\\["
-                    "\\{\"geometry_rect\":\\[108,8,100,200\\],"
-                    "\"reason\":\"incremental\","
-                    "\"client\":\"LayoutBlockFlow DIV id='target'\"\\}\\]\\}"));
+    EXPECT_THAT(
+        get_debug_info(),
+        MatchesRegex(
+            "\\{\"layer_name\":.*\"annotated_invalidation_rects\":\\["
+            "\\{\"geometry_rect\":\\[108,8,100,200\\],"
+            "\"reason\":\"incremental\","
+            "\"client\":\"LayoutN?G?BlockFlow DIV id='target'\"\\}\\]\\}"));
   }
 
   target->setAttribute(html_names::kStyleAttr, "height: 300px; width: 300px");

third_party/blink/renderer/core/paint/paint_property_tree_printer_test.cc

@@ -49,9 +49,10 @@ TEST_P(PaintPropertyTreePrinterTest, SimpleEffectTree) {
   SetBodyInnerHTML("<div style='opacity: 0.9;'>hello world</div>");
   String effect_tree_as_string =
       effectPropertyTreeAsString(*GetDocument().View());
-  EXPECT_THAT(effect_tree_as_string.Ascii().data(),
-              testing::MatchesRegex("root .*"
-                                    "  Effect \\(LayoutBlockFlow DIV\\) .*"));
+  EXPECT_THAT(
+      effect_tree_as_string.Ascii().data(),
+      testing::MatchesRegex("root .*"
+                            "  Effect \\(LayoutN?G?BlockFlow DIV\\) .*"));
 }
 
 TEST_P(PaintPropertyTreePrinterTest, SimpleScrollTree) {