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/bind.h" | 5 #include "base/bind.h" |
6 #include "base/command_line.h" | 6 #include "base/command_line.h" |
7 #include "base/test/test_suite.h" | 7 #include "base/test/test_suite.h" |
8 #include "base/test/unit_test_launcher.h" | 8 #include "base/test/unit_test_launcher.h" |
9 #include "build/build_config.h" | 9 #include "build/build_config.h" |
10 #include "media/base/media.h" | 10 #include "media/base/media.h" |
(...skipping 23 matching lines...) Expand all Loading... |
34 // Needed for surface texture support. | 34 // Needed for surface texture support. |
35 ui::gl::android::RegisterJni(env); | 35 ui::gl::android::RegisterJni(env); |
36 media::RegisterJni(env); | 36 media::RegisterJni(env); |
37 #endif | 37 #endif |
38 | 38 |
39 // Run this here instead of main() to ensure an AtExitManager is already | 39 // Run this here instead of main() to ensure an AtExitManager is already |
40 // present. | 40 // present. |
41 media::InitializeMediaLibraryForTesting(); | 41 media::InitializeMediaLibraryForTesting(); |
42 CommandLine* cmd_line = CommandLine::ForCurrentProcess(); | 42 CommandLine* cmd_line = CommandLine::ForCurrentProcess(); |
43 cmd_line->AppendSwitch(switches::kEnableMP3StreamParser); | 43 cmd_line->AppendSwitch(switches::kEnableMP3StreamParser); |
| 44 |
| 45 // Enable Opus support for all media tests. |
| 46 // TODO(vigneshv): Remove this once the Opus flag is removed or negated. |
| 47 cmd_line->AppendSwitch(switches::kEnableOpusPlayback); |
44 } | 48 } |
45 | 49 |
46 int main(int argc, char** argv) { | 50 int main(int argc, char** argv) { |
47 TestSuiteNoAtExit test_suite(argc, argv); | 51 TestSuiteNoAtExit test_suite(argc, argv); |
48 | 52 |
49 return base::LaunchUnitTests( | 53 return base::LaunchUnitTests( |
50 argc, argv, base::Bind(&TestSuiteNoAtExit::Run, | 54 argc, argv, base::Bind(&TestSuiteNoAtExit::Run, |
51 base::Unretained(&test_suite))); | 55 base::Unretained(&test_suite))); |
52 } | 56 } |
OLD | NEW |