| Index: media/base/run_all_perftests.cc
|
| diff --git a/media/base/run_all_perftests.cc b/media/base/run_all_perftests.cc
|
| index dcf58fef6b519c1d7b2dfe662106f9a79aa8d15c..54ce21b40af118a62d06948628b422c6767c1936 100644
|
| --- a/media/base/run_all_perftests.cc
|
| +++ b/media/base/run_all_perftests.cc
|
| @@ -8,12 +8,6 @@
|
| #include "build/build_config.h"
|
| #include "media/base/media.h"
|
|
|
| -#if defined(OS_ANDROID)
|
| -#include "base/android/jni_android.h"
|
| -#include "media/base/android/media_jni_registrar.h"
|
| -#include "ui/gl/android/gl_jni_registrar.h"
|
| -#endif
|
| -
|
| class TestSuiteNoAtExit : public base::TestSuite {
|
| public:
|
| TestSuiteNoAtExit(int argc, char** argv) : TestSuite(argc, argv) {}
|
| @@ -27,14 +21,6 @@ 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();
|
| - // Needed for surface texture support.
|
| - ui::gl::android::RegisterJni(env);
|
| - media::RegisterJni(env);
|
| -#endif
|
| -
|
| // Run this here instead of main() to ensure an AtExitManager is already
|
| // present.
|
| media::InitializeMediaLibrary();
|
|
|