Register JNI methods before running unittests on android.

net/base/run_all_unittests.cc

Index: net/base/run_all_unittests.cc
diff --git a/net/base/run_all_unittests.cc b/net/base/run_all_unittests.cc
index a7b82e9b63f41e60f3bbe3ba9643e6d102e37da2..8f0d3c4afacb6f99fd3e13c54991f29e791a5800 100644
--- a/net/base/run_all_unittests.cc
+++ b/net/base/run_all_unittests.cc
@@ -10,12 +10,25 @@
 #include "net/socket/ssl_server_socket.h"
 #include "net/spdy/spdy_session.h"
 
+#if defined(OS_ANDROID)
+#include "base/android/jni_android.h"
+#include "net/android/net_jni_registrar.h"
+#endif
+
 using net::internal::ClientSocketPoolBaseHelper;
 using net::SpdySession;
 
 int main(int argc, char** argv) {
   // Record histograms, so we can get histograms data in tests.
   base::StatisticsRecorder recorder;
+
+#if defined(OS_ANDROID)
+  // Register JNI bindings for android. Doing it early as the test suite setup
+  // may initiate a call to Java.
+  JNIEnv* env = base::android::AttachCurrentThread();

[Jay Civelli, 2012/06/26 20:17:11]

Nit: do you need a local var?

[nilesh, 2012/06/26 20:33:54]

Removed

+  net::android::RegisterJni(env);
+#endif
+
   NetTestSuite test_suite(argc, argv);
   ClientSocketPoolBaseHelper::set_connect_backup_jobs_enabled(false);