| 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
|
|
|