| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "base/command_line.h" | 5 #include "base/command_line.h" |
| 6 #include "base/test/test_suite.h" | 6 #include "base/test/test_suite.h" |
| 7 #include "build/build_config.h" | 7 #include "build/build_config.h" |
| 8 #include "media/base/media.h" | 8 #include "media/base/media.h" |
| 9 #include "media/base/media_switches.h" | 9 #include "media/base/media_switches.h" |
| 10 | 10 |
| (...skipping 24 matching lines...) Expand all Loading... |
| 35 #endif | 35 #endif |
| 36 | 36 |
| 37 // Run this here instead of main() to ensure an AtExitManager is already | 37 // Run this here instead of main() to ensure an AtExitManager is already |
| 38 // present. | 38 // present. |
| 39 media::InitializeMediaLibraryForTesting(); | 39 media::InitializeMediaLibraryForTesting(); |
| 40 // Enable VP8 alpha support for all media tests. | 40 // Enable VP8 alpha support for all media tests. |
| 41 // TODO(tomfinegan): Remove this once the VP8 alpha flag is removed or | 41 // TODO(tomfinegan): Remove this once the VP8 alpha flag is removed or |
| 42 // negated. | 42 // negated. |
| 43 CommandLine* cmd_line = CommandLine::ForCurrentProcess(); | 43 CommandLine* cmd_line = CommandLine::ForCurrentProcess(); |
| 44 cmd_line->AppendSwitch(switches::kEnableVp8AlphaPlayback); | 44 cmd_line->AppendSwitch(switches::kEnableVp8AlphaPlayback); |
| 45 cmd_line->AppendSwitch(switches::kEnableMP3StreamParser); |
| 45 } | 46 } |
| 46 | 47 |
| 47 int main(int argc, char** argv) { | 48 int main(int argc, char** argv) { |
| 48 return TestSuiteNoAtExit(argc, argv).Run(); | 49 return TestSuiteNoAtExit(argc, argv).Run(); |
| 49 } | 50 } |
| OLD | NEW |