| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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/test/launcher/unit_test_launcher.h" | 6 #include "base/test/launcher/unit_test_launcher.h" |
| 7 #include "base/test/test_suite.h" | 7 #include "base/test/test_suite.h" |
| 8 #include "build/build_config.h" | 8 #include "build/build_config.h" |
| 9 #include "media/base/media.h" | 9 #include "media/base/media.h" |
| 10 | 10 |
| (...skipping 19 matching lines...) Expand all Loading... |
| 30 #if defined(OS_ANDROID) | 30 #if defined(OS_ANDROID) |
| 31 // Register JNI bindings for android. | 31 // Register JNI bindings for android. |
| 32 JNIEnv* env = base::android::AttachCurrentThread(); | 32 JNIEnv* env = base::android::AttachCurrentThread(); |
| 33 // Needed for surface texture support. | 33 // Needed for surface texture support. |
| 34 ui::gl::android::RegisterJni(env); | 34 ui::gl::android::RegisterJni(env); |
| 35 media::RegisterJni(env); | 35 media::RegisterJni(env); |
| 36 #endif | 36 #endif |
| 37 | 37 |
| 38 // Run this here instead of main() to ensure an AtExitManager is already | 38 // Run this here instead of main() to ensure an AtExitManager is already |
| 39 // present. | 39 // present. |
| 40 media::InitializeMediaLibraryForTesting(); | 40 media::InitializeMediaLibrary(); |
| 41 } | 41 } |
| 42 | 42 |
| 43 int main(int argc, char** argv) { | 43 int main(int argc, char** argv) { |
| 44 TestSuiteNoAtExit test_suite(argc, argv); | 44 TestSuiteNoAtExit test_suite(argc, argv); |
| 45 | 45 |
| 46 // Always run the perf tests serially, to avoid distorting | 46 // Always run the perf tests serially, to avoid distorting |
| 47 // perf measurements with randomness resulting from running | 47 // perf measurements with randomness resulting from running |
| 48 // in parallel. | 48 // in parallel. |
| 49 return base::LaunchUnitTestsSerially( | 49 return base::LaunchUnitTestsSerially( |
| 50 argc, argv, base::Bind(&TestSuiteNoAtExit::Run, | 50 argc, argv, base::Bind(&TestSuiteNoAtExit::Run, |
| 51 base::Unretained(&test_suite))); | 51 base::Unretained(&test_suite))); |
| 52 } | 52 } |
| OLD | NEW |