| Index: chrome/browser/media_uitest.cc
|
| diff --git a/chrome/browser/media_uitest.cc b/chrome/browser/media_uitest.cc
|
| index 85f5ca2e11b625b63879c0b4bb44bd6f51c8b137..51e6919a0fe2ded9d9106cbc898ec235623fcd6e 100644
|
| --- a/chrome/browser/media_uitest.cc
|
| +++ b/chrome/browser/media_uitest.cc
|
| @@ -6,6 +6,7 @@
|
| #include "base/file_path.h"
|
| #include "base/platform_thread.h"
|
| #include "base/string_util.h"
|
| +#include "chrome/test/ui/ui_layout_test.h"
|
| #include "chrome/test/ui/ui_test.h"
|
| #include "net/base/net_util.h"
|
|
|
| @@ -54,3 +55,34 @@ TEST_F(MediaTest, VideoBearTheora) {
|
| TEST_F(MediaTest, VideoBearSilentTheora) {
|
| PlayVideo("bear_silent.ogv");
|
| }
|
| +
|
| +TEST_F(UILayoutTest, MediaUILayoutTest) {
|
| + static const char* kResources[] = {
|
| + "content",
|
| + "media-file.js",
|
| + "media-fullscreen.js",
|
| + "video-paint-test.js",
|
| + "video-played.js",
|
| + "video-test.js",
|
| + };
|
| +
|
| + static const char* kMediaTests[] = {
|
| + "video-autoplay.html",
|
| + // "video-loop.html", disabled due to 52887.
|
| + "video-no-autoplay.html",
|
| + // TODO(sergeyu): Add more tests here.
|
| + };
|
| +
|
| + FilePath test_dir;
|
| + FilePath media_test_dir;
|
| + media_test_dir = media_test_dir.AppendASCII("media");
|
| + InitializeForLayoutTest(test_dir, media_test_dir, kNoHttpPort);
|
| +
|
| + // Copy resources first.
|
| + for (size_t i = 0; i < arraysize(kResources); ++i)
|
| + AddResourceForLayoutTest(
|
| + test_dir, media_test_dir.AppendASCII(kResources[i]));
|
| +
|
| + for (size_t i = 0; i < arraysize(kMediaTests); ++i)
|
| + RunLayoutTest(kMediaTests[i], kNoHttpPort);
|
| +}
|
|
|