Shape Detection: reconnect LayoutTests

These tests were marked as flaky/crashy but after the revert in
 https://bugs.chromium.org/p/chromium/issues/detail?id=707689#c7
and the extra CLs
 https://bugs.chromium.org/p/chromium/issues/detail?id=707689#c8
and
 https://bugs.chromium.org/p/chromium/issues/detail?id=707689#c9

we should be good again, so let's reconnect these tests and
monitor
https://test-results.appspot.com/dashboards/flakiness_dashboard.html#testType=webkit_tests&tests=shapedetection%2F

BUG=707689

Review-Url: https://codereview.chromium.org/2857803002
Cr-Commit-Position: refs/heads/master@{#468970}

third_party/WebKit/LayoutTests/TestExpectations

@@ -3270,16 +3270,6 @@ crbug.com/683800 [ Win7 Debug ] external/wpt/selection/ [ Failure Pass ]
 # CQ and Rebaseline-cl for crrev.com/2626973005 does not include this
 crbug.com/680407 [ Mac ] fast/forms/select/menulist-appearance-basic.html [ NeedsManualRebaseline ]
 
-# No mock Mojo interface for services yet
-crbug.com/659139 [ Mac ] http/tests/shapedetection/shapedetection-cross-origin.html [ Skip ]
-crbug.com/659139 [ Mac ] virtual/mojo-loading/http/tests/shapedetection/shapedetection-cross-origin.html [ Skip ]
-#crbug.com/659139 [ Mac ] shapedetection/detection-HTMLCanvasElement.html [ Skip ]
-crbug.com/659139 [ Mac ] shapedetection/detection-HTMLImageElement.html [ Skip ]
-crbug.com/659139 [ Mac ] shapedetection/detection-HTMLVideoElement.html [ Skip ]
-crbug.com/659139 [ Mac ] shapedetection/detection-ImageBitmap.html [ Skip ]
-crbug.com/659139 [ Mac ] shapedetection/detection-ImageData.html [ Skip ]
-crbug.com/659139 [ Mac ] shapedetection/detection-options.html [ Skip ]
-
 # Importing 'fetch' tests from WPT.
 crbug.com/705490 external/wpt/fetch/api/basic/error-after-response.html [ Timeout Pass ]
 
@@ -3321,7 +3311,6 @@ crbug.com/700374 [ Win ] http/tests/inspector/workers-on-navigation.html [ Failu
 crbug.com/703503 inspector/tracing/timeline-js/timeline-runtime-stats.html [ Failure Pass ]
 crbug.com/703518 inspector/tracing/worker-js-frames.html [ Failure Pass ]
 crbug.com/703518 virtual/threaded/inspector/tracing/worker-js-frames.html [ Failure Pass ]
-crbug.com/703533 [ Mac ] shapedetection/detection-security-test.html  [ Crash Failure Pass Timeout ]
 crbug.com/674720 http/tests/loading/preload-img-test.html [ Pass Failure ]
 crbug.com/674720 virtual/mojo-loading/http/tests/loading/preload-img-test.html [ Pass Failure ]
 
@@ -3330,11 +3319,6 @@ crbug.com/708499 virtual/wheelscrolllatching/fast/compositor-wheel-scroll-latchi
 
 crbug.com/706091 [ Linux ] virtual/wheelscrolllatching/fast/events/wheel/wheel-scroll-latching-on-scrollbar.html [ Failure Pass ]
 
-# Sheriff failures 2017-04-03
-# Should be [ Crash Pass ], but this has a commented out [ Skip ] expectation
-# for Mac earlier in the file, so just skip it everywhere.
-crbug.com/707689 shapedetection/detection-HTMLCanvasElement.html [ Skip ]
-
 # Sheriff failures 2017-04-19
 crbug.com/713094 [ Win ] virtual/sharedarraybuffer/fast/css/fontfaceset-check-platform-fonts.html [ Failure Pass ]
 # Sheriff failure 2017-04-26

third_party/WebKit/LayoutTests/fast/shapedetection/shapedetection-empty-input-expected.txt

-This is a testharness.js-based test.
-Harness Error. harness_status.status = 1 , harness_status.message = 1 duplicate test name: "Detectors should resolve empty images with empty results."
-PASS Face 
-PASS Detectors should resolve empty images with empty results. 
-PASS Barcode 
-PASS Detectors should resolve empty images with empty results. 
-PASS Text 
-PASS Detectors should resolve empty images with empty results. 
-Harness: the test ran to completion.
-

third_party/WebKit/LayoutTests/fast/shapedetection/shapedetection-empty-input.html

@@ -22,13 +22,13 @@ var createTestForEmptyInput = function(createDetector) {
     image.onload = tryDetection;
     image.onerror = tryDetection;
     image.src = "";
-  }, "Detectors should resolve empty images with empty results.");
+  });
 };
 
 generate_tests(createTestForEmptyInput, [
-  [ "Face", () => { return new FaceDetector(); } ],
-  [ "Barcode", () => { return new BarcodeDetector(); } ],
-  [ "Text", () => { return new TextDetector(); } ]
+  [ "Face - detect(empty)", () => { return new FaceDetector(); } ],
+  [ "Barcode - detect(empty)", () => { return new BarcodeDetector(); } ],
+  [ "Text - detect(empty)", () => { return new TextDetector(); } ]
 ]);
 
 </script>

third_party/WebKit/LayoutTests/http/tests/shapedetection/shapedetection-cross-origin.html

@@ -75,6 +75,6 @@ promise_test(function(t) {
         assert_equals(error.name, "SecurityError");
       });
 },
-"FaceDetector should reject cross-origin HTMLImageElements with a SecurityError.");
+"FaceDetector should reject cross-origin HTMLVideoElements with a SecurityError.");
 
 </script>

third_party/WebKit/LayoutTests/platform/win/http/tests/shapedetection/shapedetection-cross-origin-expected.txt

-This is a testharness.js-based test.
-Harness Error. harness_status.status = 1 , harness_status.message = 1 duplicate test name: "FaceDetector should reject cross-origin HTMLImageElements with a SecurityError."
-PASS FaceDetector should reject cross-origin HTMLImageElements with a SecurityError. 
-PASS FaceDetector should reject cross-origin ImageBitmaps with a SecurityError. 
-PASS FaceDetector should reject cross-origin HTMLImageElements with a SecurityError. 
-Harness: the test ran to completion.
-

third_party/WebKit/LayoutTests/platform/win/shapedetection/detection-HTMLCanvasElement-expected.txt

-This is a testharness.js-based test.
-Harness Error. harness_status.status = 1 , harness_status.message = 1 duplicate test name: "Detector detect(HTMLCanvasElement)"
-PASS Face - HTMLCanvasElement 
-PASS Detector detect(HTMLCanvasElement) 
-PASS Face - OffscreenCanvas 
-PASS Detector detect(HTMLCanvasElement) 
-PASS Barcode - HTMLCanvasElement 
-PASS Detector detect(HTMLCanvasElement) 
-PASS Barcode - OffscreenCanvas 
-PASS Detector detect(HTMLCanvasElement) 
-PASS Text - HTMLCanvasElement 
-PASS Detector detect(HTMLCanvasElement) 
-PASS Text - OffscreenCanvas 
-PASS Detector detect(HTMLCanvasElement) 
-Harness: the test ran to completion.
-

third_party/WebKit/LayoutTests/platform/win/shapedetection/detection-HTMLImageElement-expected.txt

-This is a testharness.js-based test.
-Harness Error. harness_status.status = 1 , harness_status.message = 1 duplicate test name: "Detector detect(HTMLImageElement)"
-PASS Face 
-PASS Detector detect(HTMLImageElement) 
-PASS Barcode 
-PASS Detector detect(HTMLImageElement) 
-PASS Text 
-PASS Detector detect(HTMLImageElement) 
-Harness: the test ran to completion.
-

third_party/WebKit/LayoutTests/platform/win/shapedetection/detection-HTMLVideoElement-expected.txt

-This is a testharness.js-based test.
-Harness Error. harness_status.status = 1 , harness_status.message = 1 duplicate test name: "Detector detect(HTMLVideoElement)"
-PASS Face 
-PASS Detector detect(HTMLVideoElement) 
-PASS Barcode 
-PASS Detector detect(HTMLVideoElement) 
-PASS Text 
-PASS Detector detect(HTMLVideoElement) 
-Harness: the test ran to completion.
-

third_party/WebKit/LayoutTests/platform/win/shapedetection/detection-ImageBitmap-expected.txt

-This is a testharness.js-based test.
-Harness Error. harness_status.status = 1 , harness_status.message = 1 duplicate test name: "Detector detect(ImageBitmap)"
-PASS Face 
-PASS Detector detect(ImageBitmap) 
-PASS Barcode 
-PASS Detector detect(ImageBitmap) 
-PASS Text 
-PASS Detector detect(ImageBitmap) 
-Harness: the test ran to completion.
-

third_party/WebKit/LayoutTests/platform/win/shapedetection/detection-ImageData-expected.txt

-This is a testharness.js-based test.
-Harness Error. harness_status.status = 1 , harness_status.message = 1 duplicate test name: "Detector detect(ImageData)"
-PASS Face - ImageData 
-PASS Detector detect(ImageData) 
-PASS Barcode - ImageData 
-PASS Detector detect(ImageData) 
-PASS Text 
-PASS Detector detect(ImageData) 
-Harness: the test ran to completion.
-

third_party/WebKit/LayoutTests/platform/win/shapedetection/detection-security-test-expected.txt

-This is a testharness.js-based test.
-Harness Error. harness_status.status = 1 , harness_status.message = 5 duplicate test names: "Detector should reject undecodable images with an InvalidStateError.", "Face", "Barcode", "Detector should reject undecodable videos with an InvalidStateError.", "Text"
-PASS Face 
-PASS Detector should reject undecodable images with an InvalidStateError. 
-PASS Barcode 
-PASS Detector should reject undecodable images with an InvalidStateError. 
-PASS Text 
-PASS Detector should reject undecodable images with an InvalidStateError. 
-PASS Face 
-PASS Detector should reject undecodable videos with an InvalidStateError. 
-PASS Barcode 
-PASS Detector should reject undecodable videos with an InvalidStateError. 
-PASS Text 
-PASS Detector should reject undecodable videos with an InvalidStateError. 
-Harness: the test ran to completion.
-

third_party/WebKit/LayoutTests/platform/win/virtual/mojo-loading/http/tests/shapedetection/shapedetection-cross-origin-expected.txt

-This is a testharness.js-based test.
-Harness Error. harness_status.status = 1 , harness_status.message = 1 duplicate test name: "FaceDetector should reject cross-origin HTMLImageElements with a SecurityError."
-PASS FaceDetector should reject cross-origin HTMLImageElements with a SecurityError. 
-PASS FaceDetector should reject cross-origin ImageBitmaps with a SecurityError. 
-PASS FaceDetector should reject cross-origin HTMLImageElements with a SecurityError. 
-Harness: the test ran to completion.
-

third_party/WebKit/LayoutTests/shapedetection/detection-HTMLCanvasElement.html

@@ -42,7 +42,7 @@ var createTestForCanvasElement = function(createDetector,
     }
 
     img.src = "../media/content/greenbox.png";
-  }, "Detector detect(HTMLCanvasElement)");
+  });
 };
 
 function FaceDetectorDetectionResultTest(detectionResult, mock) {
@@ -70,42 +70,42 @@ function TextDetectorDetectionResultTest(detectionResult, mock) {
 // mock-{barcode,face}detection.js.
 generate_tests(createTestForCanvasElement, [
   [
-    "Face - HTMLCanvasElement",
+    "Face - detect(HTMLCanvasElement)",
     () => { return new FaceDetector(); },
     () => { return document.createElement("canvas"); },
     () => { return mockFaceDetectionProviderReady; },
     FaceDetectorDetectionResultTest
   ],
   [
-    "Face - OffscreenCanvas",
+    "Face - detect(OffscreenCanvas)",
     () => { return new FaceDetector(); },
     () => { return new OffscreenCanvas(300, 150); },
     () => { return mockFaceDetectionProviderReady; },
     FaceDetectorDetectionResultTest
   ],
   [
-    "Barcode - HTMLCanvasElement",
+    "Barcode - detect(HTMLCanvasElement)",
     () => { return new BarcodeDetector(); },
     () => { return document.createElement("canvas"); },
     () => { return mockBarcodeDetectionReady; },
     BarcodeDetectorDetectionResultTest
   ],
   [
-    "Barcode - OffscreenCanvas",
+    "Barcode - detect(OffscreenCanvas)",
     () => { return new BarcodeDetector(); },
     () => { return new OffscreenCanvas(300, 150); },
     () => { return mockBarcodeDetectionReady; },
     BarcodeDetectorDetectionResultTest
   ],
   [
-    "Text - HTMLCanvasElement",
+    "Text - detect(HTMLCanvasElement)",
     () => { return new TextDetector(); },
     () => { return document.createElement("canvas"); },
     () => { return mockTextDetectionReady; },
     TextDetectorDetectionResultTest
   ],
   [
-    "Text - OffscreenCanvas",
+    "Text - detect(OffscreenCanvas)",
     () => { return new TextDetector(); },
     () => { return new OffscreenCanvas(300, 150); },
     () => { return mockTextDetectionReady; },

third_party/WebKit/LayoutTests/shapedetection/detection-HTMLImageElement.html

@@ -36,7 +36,7 @@ var createTestForImageElement = function(createDetector, mockReady,
         assert_unreached("Error during detect(img): " + error);
       });
 
-  }, "Detector detect(HTMLImageElement)");
+  });
 };
 
 function FaceDetectorDetectionResultTest(detectionResult, mock) {
@@ -63,19 +63,19 @@ function TextDetectorDetectionResultTest(detectionResult, mock) {
 // Use the mock mojo server implemented in mock-{barcode,face}detection.js.
 generate_tests(createTestForImageElement, [
   [
-    "Face",
+    "Face - detect(HTMLImageElement)",
     () => { return new FaceDetector(); },
     () => { return mockFaceDetectionProviderReady; },
     FaceDetectorDetectionResultTest
   ],
   [
-    "Barcode",
+    "Barcode - detect(HTMLImageElement)",
     () => { return new BarcodeDetector(); },
     () => { return mockBarcodeDetectionReady; },
     BarcodeDetectorDetectionResultTest
   ],
   [
-    "Text",
+    "Text - detect(HTMLImageElement)",
     () => { return new TextDetector(); },
     () => { return mockTextDetectionReady; },
     TextDetectorDetectionResultTest

third_party/WebKit/LayoutTests/shapedetection/detection-HTMLVideoElement.html

@@ -39,7 +39,7 @@ var createTestForVideoElement = function(createDetector, mockReady,
     });
 
     video.load();
-  }, "Detector detect(HTMLVideoElement)");
+  });
 };
 
 function FaceDetectorDetectionResultTest(detectionResult, mock) {
@@ -67,19 +67,19 @@ function TextDetectorDetectionResultTest(detectionResult, mock) {
 // Use the mock mojo server implemented in mock-{barcode,face}detection.js.
 generate_tests(createTestForVideoElement, [
   [
-    "Face",
+    "Face - detect(HTMLVideoElement)",
     () => { return new FaceDetector(); },
     () => { return mockFaceDetectionProviderReady; },
     FaceDetectorDetectionResultTest
   ],
   [
-    "Barcode",
+    "Barcode - detect(HTMLVideoElement)",
     () => { return new BarcodeDetector(); },
     () => { return mockBarcodeDetectionReady; },
     BarcodeDetectorDetectionResultTest
   ],
   [
-    "Text",
+    "Text - detect(HTMLVideoElement)",
     () => { return new TextDetector(); },
     () => { return mockTextDetectionReady; },
     TextDetectorDetectionResultTest

third_party/WebKit/LayoutTests/shapedetection/detection-ImageBitmap.html

@@ -44,7 +44,7 @@ var createTestForImageBitmap = function(createDetector, mockReady,
           });
     }
     img.src = "../media/content/greenbox.png";
-  }, "Detector detect(ImageBitmap)");
+  });
 };
 
 function FaceDetectorDetectionResultTest(detectionResult, mock) {
@@ -71,19 +71,19 @@ function TextDetectorDetectionResultTest(detectionResult, mock) {
 // Use the mock mojo server implemented in mock-{barcode,face}detection.js.
 generate_tests(createTestForImageBitmap, [
   [
-    "Face",
+    "Face - detect(ImageBitmap)",
     () => { return new FaceDetector(); },
     () => { return mockFaceDetectionProviderReady; },
     FaceDetectorDetectionResultTest
   ],
   [
-    "Barcode",
+    "Barcode - detect(ImageBitmap)",
     () => { return new BarcodeDetector(); },
     () => { return mockBarcodeDetectionReady; },
     BarcodeDetectorDetectionResultTest
   ],
   [
-    "Text",
+    "Text - detect(ImageBitmap)",
     () => { return new TextDetector(); },
     () => { return mockTextDetectionReady; },
     TextDetectorDetectionResultTest

third_party/WebKit/LayoutTests/shapedetection/detection-ImageData.html

@@ -41,7 +41,7 @@ var createTestForImageData = function(createDetector, mockReady,
     }
 
     img.src = "../media/content/greenbox.png";
-  }, "Detector detect(ImageData)");
+  });
 };
 
 function FaceDetectorDetectionResultTest(detectionResult, mock) {
@@ -68,19 +68,19 @@ function TextDetectorDetectionResultTest(detectionResult, mock) {
 // the mock mojo server implemented in mock-{barcode,face}detection.js.
 generate_tests(createTestForImageData, [
   [
-    "Face - ImageData",
+    "Face - detect(ImageData)",
     () => { return new FaceDetector(); },
     () => { return mockFaceDetectionProviderReady; },
     FaceDetectorDetectionResultTest
   ],
   [
-    "Barcode - ImageData",
+    "Barcode - detect(ImageData)",
     () => { return new BarcodeDetector(); },
     () => { return mockBarcodeDetectionReady; },
     BarcodeDetectorDetectionResultTest
   ],
   [
-    "Text",
+    "Text - detect(ImageData)",
     () => { return new TextDetector(); },
     () => { return mockTextDetectionReady; },
     TextDetectorDetectionResultTest

third_party/WebKit/LayoutTests/shapedetection/detection-security-test.html

@@ -40,13 +40,14 @@ var createTestForBadImage = function(createDetector) {
         .then(function(error) {
           assert_equals(error.name, "InvalidStateError");
         });
-  }, "Detector should reject undecodable images with an InvalidStateError.");
+  });
 };
 
+// Detectors should reject undecodable images with an InvalidStateError.
 generate_tests(createTestForBadImage, [
-  [ "Face", () => { return new FaceDetector(); } ],
-  [ "Barcode", () => { return new BarcodeDetector(); } ],
-  [ "Text", () => { return new TextDetector(); } ]
+  [ "Face - detect(broken image)", () => { return new FaceDetector(); } ],
+  [ "Barcode - detect(broken image)", () => { return new BarcodeDetector(); } ],
+  [ "Text - detect(broken image)", () => { return new TextDetector(); } ]
 ]);
 
 // This test verifies that a Detector will reject a broken video.
@@ -58,13 +59,14 @@ var createTestForBadVideo = function(createDetector) {
         .then(function(error) {
           assert_equals(error.name, "InvalidStateError");
         });
-  }, "Detector should reject undecodable videos with an InvalidStateError.");
+  });
 };
 
+// Detectors should reject undecodable videos with an InvalidStateError.
 generate_tests(createTestForBadVideo, [
-  [ "Face", () => { return new FaceDetector(); } ],
-  [ "Barcode", () => { return new BarcodeDetector(); } ],
-  [ "Text", () => { return new TextDetector(); } ]
+  [ "Face - detect(broken video)", () => { return new FaceDetector(); } ],
+  [ "Barcode - detect(broken video)", () => { return new BarcodeDetector(); } ],
+  [ "Text - detect(broken video)", () => { return new TextDetector(); } ]
 ]);
 
 </script>