Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1174)

Unified Diff: content/browser/media_browsertest.cc

Issue 10941011: Rewrite layout_browsertests to use content_shell --dump-render-tree to execute layout tests (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: updates Created 8 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: content/browser/media_browsertest.cc
diff --git a/content/browser/media_browsertest.cc b/content/browser/media_browsertest.cc
index 593fb63d640dddeba40e44c02a8207ccb17ca3db..20c1a5727fe5be2c415ab933a3eac6c1f026a7e6 100644
--- a/content/browser/media_browsertest.cc
+++ b/content/browser/media_browsertest.cc
@@ -169,27 +169,12 @@ class MediaLayoutTest : public InProcessBrowserLayoutTest {
virtual ~MediaLayoutTest() {}
virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE {
+ InProcessBrowserLayoutTest::SetUpCommandLine(command_line);
// TODO(dalecurtis): Not all Buildbots have viable audio devices, so disable
// audio to prevent tests from hanging; e.g., a device which is hardware
// muted. See http://crbug.com/120749
command_line->AppendSwitch(switches::kDisableAudio);
}
-
- virtual void SetUpInProcessBrowserTestFixture() OVERRIDE {
- InProcessBrowserLayoutTest::SetUpInProcessBrowserTestFixture();
- AddResourceForLayoutTest(FilePath().AppendASCII("media"),
- FilePath().AppendASCII("content"));
- AddResourceForLayoutTest(FilePath().AppendASCII("media"),
- FilePath().AppendASCII("media-file.js"));
- AddResourceForLayoutTest(FilePath().AppendASCII("media"),
- FilePath().AppendASCII("media-fullscreen.js"));
- AddResourceForLayoutTest(FilePath().AppendASCII("media"),
- FilePath().AppendASCII("video-paint-test.js"));
- AddResourceForLayoutTest(FilePath().AppendASCII("media"),
- FilePath().AppendASCII("video-played.js"));
- AddResourceForLayoutTest(FilePath().AppendASCII("media"),
- FilePath().AppendASCII("video-test.js"));
- }
};
// Each browser test can only correspond to a single layout test, otherwise the

Powered by Google App Engine
This is Rietveld 408576698