summaryrefslogtreecommitdiffstats
path: root/media/base/run_all_unittests.cc
diff options
context:
space:
mode:
authoryfriedman@chromium.org <yfriedman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-08-23 19:53:31 +0000
committeryfriedman@chromium.org <yfriedman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-08-23 19:53:31 +0000
commit25a727ec3904c8269792388a7722aa96fbdaad48 (patch)
tree233996674908adcab2b8383ef7ce688cce840644 /media/base/run_all_unittests.cc
parent6638d8234ab3c0c46a5e8fca8c915d155ddf0cd1 (diff)
downloadchromium_src-25a727ec3904c8269792388a7722aa96fbdaad48.zip
chromium_src-25a727ec3904c8269792388a7722aa96fbdaad48.tar.gz
chromium_src-25a727ec3904c8269792388a7722aa96fbdaad48.tar.bz2
Reland 219061:
> Introduce facade for interaction with Android SurfaceTexture. > > Cleans up some of the JNI and makes usage of Android APIs more explicit. > BUG=261717 > TBR=apatrick > NOTRY=true > > Review URL: https://chromiumcodereview.appspot.com/22912020 The media unittest JNI registrar needed to be updated to explicitly register the surface texture JNI which is no longer done lazily. BUG=261717 TBR=bulach,sievers,apatrick NOTRY=true Review URL: https://chromiumcodereview.appspot.com/22893054 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@219316 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media/base/run_all_unittests.cc')
-rw-r--r--media/base/run_all_unittests.cc3
1 files changed, 3 insertions, 0 deletions
diff --git a/media/base/run_all_unittests.cc b/media/base/run_all_unittests.cc
index 4274634..28ef5c6 100644
--- a/media/base/run_all_unittests.cc
+++ b/media/base/run_all_unittests.cc
@@ -11,6 +11,7 @@
#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 {
@@ -28,6 +29,8 @@ void TestSuiteNoAtExit::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