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

Unified Diff: net/android/net_jni_registrar.cc

Issue 1839803002: Remove net & url small, iOS ICU alternatives, unit tests. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 4 years, 8 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 | « net/BUILD.gn ('k') | net/base/net_string_util_icu_alternatives_ios.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/android/net_jni_registrar.cc
diff --git a/net/android/net_jni_registrar.cc b/net/android/net_jni_registrar.cc
index ba1b5a8d789ef1c8c8d2e22602a384e87c04362f..0a9a6be9ade485e030acd2dd4293e781cdb36b98 100644
--- a/net/android/net_jni_registrar.cc
+++ b/net/android/net_jni_registrar.cc
@@ -14,8 +14,9 @@
#include "net/android/traffic_stats.h"
#include "net/cert/x509_util_android.h"
#include "net/proxy/proxy_config_service_android.h"
+#include "url/url_features.h"
-#if defined(USE_ICU_ALTERNATIVES_ON_ANDROID)
+#if BUILDFLAG(USE_PLATFORM_ICU_ALTERNATIVES)
#include "net/base/net_string_util_icu_alternatives_android.h" // nogncheck
#endif
@@ -32,7 +33,7 @@ static base::android::RegistrationMethod kNetRegisteredMethods[] = {
{"NetworkChangeNotifierAndroid", NetworkChangeNotifierAndroid::Register},
{"ProxyConfigService", ProxyConfigServiceAndroid::Register},
{"X509Util", RegisterX509Util},
-#if defined(USE_ICU_ALTERNATIVES_ON_ANDROID)
+#if BUILDFLAG(USE_PLATFORM_ICU_ALTERNATIVES)
{"NetStringUtils", RegisterNetStringUtils}
#endif
};
« no previous file with comments | « net/BUILD.gn ('k') | net/base/net_string_util_icu_alternatives_ios.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698