Revert 179189

Failed to rename package name in buildbot scripts. Broke buildbots.

> Add apk for running content_browsertests
>     
> Split off org.chromium.content_shell into:
>       org.chromium.content_shell - content shell java code, builds a jar, directory structure similar to other jar targets
>       org.chromium.content_shell_apk - application code to build content_shell_apk, directory structure similar to that of android application
>       org.chromium.content_browsertests_apk - application code to build content_browsertests_apk
> 
> Also splitting content/shell/android/res into:
>   - content/shell/android/java/res 
>   - content/shell/android/shell_apk/res
> 
> Both content_shell_apk and content_browsertests_apk will depend on content_shell_java target to include java/res needed to show a shell based browser.
>     
> I will do another CL to move The java files for content_shell_tests_apk to content_shell_apk package.
>     
> BUG=138275
> 
> 
> Review URL: https://chromiumcodereview.appspot.com/12047068

TBR=nileshagrawal@chromium.org
Review URL: https://codereview.chromium.org/12088031

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

1 files changed, 18 insertions, 0 deletions

diff --git a/content/test/run_all_unittests.cc b/content/test/run_all_unittests.cc
index 695cebe..58de889 100644
--- a/content/test/run_all_unittests.cc
+++ b/content/test/run_all_unittests.cc
@@ -5,7 +5,25 @@
 #include "content/test/content_test_suite.h"
 #include "content/public/test/unittest_test_suite.h"
 
+#if defined(OS_ANDROID)
+#include "base/android/jni_android.h"
+#include "content/browser/android/browser_jni_registrar.h"
+#include "content/common/android/common_jni_registrar.h"
+#include "net/android/net_jni_registrar.h"
+#include "ui/android/ui_jni_registrar.h"
+#endif
+
 int main(int argc, char** argv) {
+
+#if defined(OS_ANDROID)
+  // Register JNI bindings for android.
+  JNIEnv* env = base::android::AttachCurrentThread();
+  content::android::RegisterCommonJni(env);
+  content::android::RegisterBrowserJni(env);
+  net::android::RegisterJni(env);
+  ui::android::RegisterJni(env);
+#endif
+
   return content::UnitTestTestSuite(
       new content::ContentTestSuite(argc, argv)).Run();
 }