| Index: media/base/run_all_unittests.cc
|
| diff --git a/media/base/run_all_unittests.cc b/media/base/run_all_unittests.cc
|
| index c413874b8c7c8c4ce2635704a0ff6738ad8600b9..899172b6a65a4f708bbd0ad6ac375dcd426b1cf1 100644
|
| --- a/media/base/run_all_unittests.cc
|
| +++ b/media/base/run_all_unittests.cc
|
| @@ -4,9 +4,15 @@
|
|
|
| #include "base/command_line.h"
|
| #include "base/test/test_suite.h"
|
| +#include "build/build_config.h"
|
| #include "media/base/media.h"
|
| #include "media/base/media_switches.h"
|
|
|
| +#if defined(OS_ANDROID)
|
| +#include "base/android/jni_android.h"
|
| +#include "media/base/android/media_jni_registrar.h"
|
| +#endif
|
| +
|
| class TestSuiteNoAtExit : public base::TestSuite {
|
| public:
|
| TestSuiteNoAtExit(int argc, char** argv) : TestSuite(argc, argv) {}
|
| @@ -18,6 +24,13 @@ class TestSuiteNoAtExit : public base::TestSuite {
|
| void TestSuiteNoAtExit::Initialize() {
|
| // Run TestSuite::Initialize first so that logging is initialized.
|
| base::TestSuite::Initialize();
|
| +
|
| +#if defined(OS_ANDROID)
|
| + // Register JNI bindings for android.
|
| + JNIEnv* env = base::android::AttachCurrentThread();
|
| + media::RegisterJni(env);
|
| +#endif
|
| +
|
| // Run this here instead of main() to ensure an AtExitManager is already
|
| // present.
|
| media::InitializeMediaLibraryForTesting();
|
|
|