Need to call RegisterJni for testing.

BUG=

Review URL: https://codereview.chromium.org/13949012

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@194530 0039d316-1c4b-4281-b951-d872f2087c98

build/common.gypi

@@ -641,6 +641,13 @@
         }, {
           'test_isolation_mode%': 'noop',
         }],
+        # Whether Android ARM build uses OpenMAX DL FFT.  Default is
+        # yes.  This will also enable WebAudio on Android ARM.
+        ['OS=="android" and target_arch=="arm"', {
+          'use_openmax_dl_fft%': 1,
+        }, {
+          'use_openmax_dl_fft%': 0,
+        }],
       ],
 
       # Set this to 1 to use the Google-internal file containing
@@ -676,9 +683,6 @@
       'google_api_key%': '',
       'google_default_client_id%': '',
       'google_default_client_secret%': '',
-
-      # Whether Android uses OpenMAX DL FFT.  Default is no.
-      'use_openmax_dl_fft%': 0,
     },
 
     # Copy conditionally-set variables out one scope.

media/base/media_android.cc

@@ -6,7 +6,9 @@
 
 #include <cpu-features.h>
 
+#include "base/android/jni_android.h"
 #include "base/logging.h"
+#include "media/base/android/media_jni_registrar.h"
 
 namespace media {
 
@@ -22,6 +24,9 @@ bool InitializeMediaLibrary(const base::FilePath& module_dir) {
 }
 
 void InitializeMediaLibraryForTesting() {
+  // Register JNI bindings for android.
+  JNIEnv* env = base::android::AttachCurrentThread();
+  RegisterJni(env);
 }
 
 bool IsMediaLibraryInitialized() {