Move a test from canvas-experimental/ to canvas/

This test was originally put under canvas-experimental/webgl/ folder. We already have a webgl/ folder under canvas/. So this CL moves the test to canvas/webgl/. Bug: 725651 Change-Id: I790ccdf303f64116811a4159bdaf24a35dbae61e Reviewed-on: https://chromium-review.googlesource.com/579150 Commit-Queue: Xida Chen <xidachen@chromium.org> Reviewed-by: Justin Novosad <junov@chromium.org> Reviewed-by: Kai Ninomiya <kainino@chromium.org> Cr-Commit-Position: refs/heads/master@{#488275}

Move a test from canvas-experimental/ to canvas/
This test was originally put under canvas-experimental/webgl/ folder. We already have a webgl/ folder under canvas/. So this CL moves the test to canvas/webgl/. Bug: 725651 Change-Id: I790ccdf303f64116811a4159bdaf24a35dbae61e Reviewed-on: https://chromium-review.googlesource.com/579150 Commit-Queue: Xida Chen <xidachen@chromium.org> Reviewed-by: Justin Novosad <junov@chromium.org> Reviewed-by: Kai Ninomiya <kainino@chromium.org> Cr-Commit-Position: refs/heads/master@{#488275}
7489031e · Xida Chen · Commit Bot · 8bb4588a · 7489031e · 7489031e
Commit 7489031e authored Jul 20, 2017 by Xida Chen Committed by Commit Bot Jul 20, 2017
5 changed files
--- a/third_party/WebKit/LayoutTests/TestExpectations
+++ b/third_party/WebKit/LayoutTests/TestExpectations
@@ -2897,9 +2897,6 @@ crbug.com/722943 media/audio-repaint.html [ Skip ]
 # Flaky timeout
 crbug.com/723297 virtual/off-main-thread-fetch/http/tests/inspector/service-workers/service-workers-redundant.html [ Timeout ]

-# Tests to be run only under virtual/experimental-canvas-features/
-crbug.com/682753 fast/canvas-experimental [ Skip ]
-
 crbug.com/715405 virtual/mojo-loading/http/tests/inspector/network/waterfall-images.html [ Skip ]
 crbug.com/714166 http/tests/inspector/network/waterfall-images.html [ Skip ]
 crbug.com/708175 external/wpt/IndexedDB/interleaved-cursors.html [ Failure Pass ]

--- a/third_party/WebKit/LayoutTests/VirtualTestSuites
+++ b/third_party/WebKit/LayoutTests/VirtualTestSuites
@@ -503,11 +503,6 @@
    "base": "print_testharness",
    "args": ["--enable-print-browser"]
  },
-  {
-    "prefix": "experimental-canvas-features",
-    "base": "fast/canvas-experimental",
-    "args": ["--enable-experimental-canvas-features"]
-  },
  {
    "prefix": "new-remote-playback-pipeline",
    "base": "media/remoteplayback",

--- a/third_party/WebKit/LayoutTests/fast/canvas-experimental/webgl/texImage-video-last-uploaded-metadata-expected.txt
+++ b/third_party/WebKit/LayoutTests/fast/canvas-experimental/webgl/texImage-video-last-uploaded-metadata-expected.txt
--- a/third_party/WebKit/LayoutTests/fast/canvas-experimental/webgl/texImage-video-last-uploaded-metadata.html
+++ b/third_party/WebKit/LayoutTests/fast/canvas-experimental/webgl/texImage-video-last-uploaded-metadata.html
 <!DOCTYPE html>
 <html>
 <head>
-<script src="../../canvas/webgl/resources/webgl-test-utils-full.js"></script>
-<script src="../../canvas/webgl/resources/tex-image-and-sub-image-utils.js"></script>
+<script src="./resources/webgl-test-utils-full.js"></script>
+<script src="./resources/tex-image-and-sub-image-utils.js"></script>
 <script src="../../../resources/js-test.js"></script>
 <script>

@@ -49,7 +49,7 @@ function init()
        video.oncanplaythrough = runTest;
        video.currentTime = 2.0;
    };
-    video.src = "../../canvas/webgl/resources/red-green.ogv";
+    video.src = "./resources/red-green.ogv";
 }
 </script>
 </head>

--- a/third_party/WebKit/LayoutTests/virtual/experimental-canvas-features/fast/canvas-experimental/README.txt
+++ b/third_party/WebKit/LayoutTests/virtual/experimental-canvas-features/fast/canvas-experimental/README.txt
-This suite runs the tests in LayoutTests/fast/canvas-experimental with the
--enable-experimental-canvas-features flag. These tests are otherwise skipped.
-Use it for tests which REQUIRE this flag, but would otherwise go in fast/canvas.