| 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_discardable_memory_allocator.h" | 8 #include "base/test/test_discardable_memory_allocator.h" |
| 9 #include "base/test/test_suite.h" | 9 #include "base/test/test_suite.h" |
| 10 #include "build/build_config.h" | 10 #include "build/build_config.h" |
| 11 #include "media/base/fake_media_resources.h" |
| 11 #include "media/base/media.h" | 12 #include "media/base/media.h" |
| 12 #include "media/base/media_switches.h" | 13 #include "media/base/media_switches.h" |
| 13 | 14 |
| 14 #if defined(OS_ANDROID) | 15 #if defined(OS_ANDROID) |
| 15 #include "base/android/jni_android.h" | 16 #include "base/android/jni_android.h" |
| 16 #include "media/base/android/media_jni_registrar.h" | 17 #include "media/base/android/media_jni_registrar.h" |
| 17 #include "ui/gl/android/gl_jni_registrar.h" | 18 #include "ui/gl/android/gl_jni_registrar.h" |
| 18 #endif | 19 #endif |
| 19 | 20 |
| 20 class TestSuiteNoAtExit : public base::TestSuite { | 21 class TestSuiteNoAtExit : public base::TestSuite { |
| (...skipping 19 matching lines...) Expand all Loading... |
| 40 // Register JNI bindings for android. | 41 // Register JNI bindings for android. |
| 41 JNIEnv* env = base::android::AttachCurrentThread(); | 42 JNIEnv* env = base::android::AttachCurrentThread(); |
| 42 // Needed for surface texture support. | 43 // Needed for surface texture support. |
| 43 ui::gl::android::RegisterJni(env); | 44 ui::gl::android::RegisterJni(env); |
| 44 media::RegisterJni(env); | 45 media::RegisterJni(env); |
| 45 #endif | 46 #endif |
| 46 | 47 |
| 47 // Run this here instead of main() to ensure an AtExitManager is already | 48 // Run this here instead of main() to ensure an AtExitManager is already |
| 48 // present. | 49 // present. |
| 49 media::InitializeMediaLibrary(); | 50 media::InitializeMediaLibrary(); |
| 51 media::SetUpFakeMediaResources(); |
| 50 | 52 |
| 51 base::DiscardableMemoryAllocator::SetInstance(&discardable_memory_allocator_); | 53 base::DiscardableMemoryAllocator::SetInstance(&discardable_memory_allocator_); |
| 52 } | 54 } |
| 53 | 55 |
| 54 int main(int argc, char** argv) { | 56 int main(int argc, char** argv) { |
| 55 TestSuiteNoAtExit test_suite(argc, argv); | 57 TestSuiteNoAtExit test_suite(argc, argv); |
| 56 | 58 |
| 57 return base::LaunchUnitTests( | 59 return base::LaunchUnitTests( |
| 58 argc, argv, base::Bind(&TestSuiteNoAtExit::Run, | 60 argc, argv, base::Bind(&TestSuiteNoAtExit::Run, |
| 59 base::Unretained(&test_suite))); | 61 base::Unretained(&test_suite))); |
| 60 } | 62 } |
| OLD | NEW |