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

Unified Diff: chrome/test/base/chrome_test_suite.cc

Issue 10827134: Include chromium_net.jar in unit_tests_apk. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Moved to chrome_test_suite.cc Created 8 years, 5 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 | « chrome/chrome_tests.gypi ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/test/base/chrome_test_suite.cc
diff --git a/chrome/test/base/chrome_test_suite.cc b/chrome/test/base/chrome_test_suite.cc
index 72b1fba408185563c87bf2acd36b13bd5c56bae4..0606024a2ab0b9fb54ae31d1416c341f253bd094 100644
--- a/chrome/test/base/chrome_test_suite.cc
+++ b/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_);
« no previous file with comments | « chrome/chrome_tests.gypi ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698