Index: content/browser/media_browsertest.cc |
diff --git a/content/browser/media_browsertest.cc b/content/browser/media_browsertest.cc |
index 41f3ac3beec234e4e82b46b22af5c08d1f0a7624..16406e14fdc7fe0bb098a84d63d4893fb8b98fca 100644 |
--- a/content/browser/media_browsertest.cc |
+++ b/content/browser/media_browsertest.cc |
@@ -34,14 +34,6 @@ class MediaTest : public testing::WithParamInterface<bool>, |
ASSERT_NO_FATAL_FAILURE(PlayMedia("video", media_file, http)); |
} |
- protected: |
- virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { |
- // 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); |
- } |
- |
private: |
GURL GetTestURL(const char* tag, const char* media_file, bool http) { |
if (http) { |
@@ -168,14 +160,6 @@ class MediaLayoutTest : public InProcessBrowserLayoutTest { |
FilePath(), FilePath().AppendASCII("media")) { |
} |
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); |
- } |
}; |
// Each browser test can only correspond to a single layout test, otherwise the |