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

Unified Diff: net/test/run_all_unittests.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: Code cleaning 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
Index: net/test/run_all_unittests.cc
diff --git a/net/test/run_all_unittests.cc b/net/test/run_all_unittests.cc
index e5ea90043b79ac4cf16d6a1efcb699c13a2ed320..e23aa9f638acccac236cd7ce786523342dafd95a 100644
--- a/net/test/run_all_unittests.cc
+++ b/net/test/run_all_unittests.cc
@@ -6,6 +6,7 @@
#include "base/test/launcher/unit_test_launcher.h"
#include "build/build_config.h"
#include "crypto/nss_util.h"
+#include "net/features.h"
#include "net/socket/client_socket_pool_base.h"
#include "net/socket/ssl_server_socket.h"
#include "net/spdy/spdy_session.h"
@@ -20,7 +21,7 @@
#include "net/android/net_jni_registrar.h"
#endif
-#if defined(USE_ICU_ALTERNATIVES_ON_ANDROID)
+#if BUILDFLAG(USE_PLATFORM_ICU_ALTERNATIVES)
#include "url/android/url_jni_registrar.h" // nogncheck
#endif
@@ -42,7 +43,7 @@ int main(int argc, char** argv) {
{"NetAndroid", net::android::RegisterJni},
{"TestFileUtil", base::RegisterContentUriTestUtils},
{"TestUiThreadAndroid", base::RegisterTestUiThreadAndroid},
-#if defined(USE_ICU_ALTERNATIVES_ON_ANDROID)
+#if BUILDFLAG(USE_PLATFORM_ICU_ALTERNATIVES)
{"UrlAndroid", url::android::RegisterJni},
#endif
};

Powered by Google App Engine
This is Rietveld 408576698