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

Unified Diff: net/test/run_all_unittests.cc

Issue 257673002: Make it possible to build url/ without ICU on android. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Missed a spot Created 6 years, 7 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 | « components/cronet/android/cronet_jni.cc ('k') | url/BUILD.gn » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/test/run_all_unittests.cc
diff --git a/net/test/run_all_unittests.cc b/net/test/run_all_unittests.cc
index 1067c21fd8ab37376b127779f6a41571a4cb2583..96e8a3c834625145110a1bd8590d3875abebbfd8 100644
--- a/net/test/run_all_unittests.cc
+++ b/net/test/run_all_unittests.cc
@@ -13,8 +13,10 @@
#if defined(OS_ANDROID)
#include "base/android/jni_android.h"
+#include "base/android/jni_registrar.h"
#include "base/test/test_file_util.h"
#include "net/android/net_jni_registrar.h"
+#include "url/android/url_jni_registrar.h"
#endif
#if !defined(OS_IOS)
@@ -29,10 +31,18 @@ int main(int argc, char** argv) {
base::StatisticsRecorder::Initialize();
#if defined(OS_ANDROID)
+ const base::android::RegistrationMethod kNetTestRegisteredMethods[] = {
+ {"NetAndroid", net::android::RegisterJni},
+ {"TestFileUtil", file_util::RegisterContentUriTestUtils},
+ {"UrlAndroid", url::android::RegisterJni},
+ };
+
// Register JNI bindings for android. Doing it early as the test suite setup
// may initiate a call to Java.
- net::android::RegisterJni(base::android::AttachCurrentThread());
- file_util::RegisterContentUriTestUtils(base::android::AttachCurrentThread());
+ base::android::RegisterNativeMethods(
+ base::android::AttachCurrentThread(),
+ kNetTestRegisteredMethods,
+ arraysize(kNetTestRegisteredMethods));
#endif
NetTestSuite test_suite(argc, argv);
« no previous file with comments | « components/cronet/android/cronet_jni.cc ('k') | url/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698