Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(176)

Unified Diff: content/test/run_all_unittests.cc

Issue 12088031: Revert 179189 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 7 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/test/content_test_launcher.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/test/run_all_unittests.cc
===================================================================
--- content/test/run_all_unittests.cc (revision 179209)
+++ content/test/run_all_unittests.cc (working copy)
@@ -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();
}
« no previous file with comments | « content/test/content_test_launcher.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698