| 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/launcher/unit_test_launcher.h" | 7 #include "base/test/launcher/unit_test_launcher.h" |
| 8 #include "base/test/test_suite.h" | 8 #include "base/test/test_suite.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 22 matching lines...) Expand all Loading... |
| 33 JNIEnv* env = base::android::AttachCurrentThread(); | 33 JNIEnv* env = base::android::AttachCurrentThread(); |
| 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::kEnableADTSStreamParser); |
| 43 cmd_line->AppendSwitch(switches::kEnableMP3StreamParser); | 44 cmd_line->AppendSwitch(switches::kEnableMP3StreamParser); |
| 44 } | 45 } |
| 45 | 46 |
| 46 int main(int argc, char** argv) { | 47 int main(int argc, char** argv) { |
| 47 TestSuiteNoAtExit test_suite(argc, argv); | 48 TestSuiteNoAtExit test_suite(argc, argv); |
| 48 | 49 |
| 49 return base::LaunchUnitTests( | 50 return base::LaunchUnitTests( |
| 50 argc, argv, base::Bind(&TestSuiteNoAtExit::Run, | 51 argc, argv, base::Bind(&TestSuiteNoAtExit::Run, |
| 51 base::Unretained(&test_suite))); | 52 base::Unretained(&test_suite))); |
| 52 } | 53 } |
| OLD | NEW |