Include chromium_net.jar in unit_tests_apk.

Also Register JNI before running unit_tests on Android.

BUG=


Review URL: https://chromiumcodereview.appspot.com/10827134

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

chrome/chrome_tests.gypi

@@ -4585,6 +4585,7 @@
           'type': 'none',
           'dependencies': [
             '../base/base.gyp:base_java',
+            '../net/net.gyp:net_java',
             'unit_tests',
           ],
           'variables': {
@@ -4592,6 +4593,7 @@
             'input_shlib_path': '<(SHARED_LIB_DIR)/<(SHARED_LIB_PREFIX)unit_tests<(SHARED_LIB_SUFFIX)',
             'input_jars_paths': [
               '<(PRODUCT_DIR)/lib.java/chromium_base.jar',
+              '<(PRODUCT_DIR)/lib.java/chromium_net.jar',
              ],
           },
           'includes': [ '../build/apk_test.gypi' ],

chrome/test/base/chrome_test_suite.cc

@@ -31,6 +31,11 @@
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/base/resource/resource_handle.h"
 
+#if defined(OS_ANDROID)
+#include "base/android/jni_android.h"
+#include "net/android/net_jni_registrar.h"
+#endif
+
 #if defined(OS_MACOSX)
 #include "base/mac/bundle_locations.h"
 #include "base/mac/mac_util.h"
@@ -183,6 +188,11 @@ void ChromeTestSuite::Initialize() {
   chrome_browser_application_mac::RegisterBrowserCrApp();
 #endif
 
+#if defined(OS_ANDROID)
+  // Register JNI bindings for android.
+  net::android::RegisterJni(base::android::AttachCurrentThread());
+#endif
+
   chrome::RegisterPathProvider();
   if (!browser_dir_.empty()) {
     PathService::Override(base::DIR_EXE, browser_dir_);