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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: net/base/net_util_unittest.cc

Issue 8429034: Upstream: Build net_unittests for Android. (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: address comments Created 9 years, 1 month 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
« net/base/host_resolver_impl.cc ('K') | « net/base/host_resolver_impl.cc ('k') | net/base/platform_mime_util_linux.cc » ('j') | net/base/platform_mime_util_linux.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/base/net_util_unittest.cc
diff --git a/net/base/net_util_unittest.cc b/net/base/net_util_unittest.cc
index 5a24a315d58e7c9627bc71b5e7ff7406f28b4b74..276976dc9ce94eac113e6714a87fafb76064c81c 100644
--- a/net/base/net_util_unittest.cc
+++ b/net/base/net_util_unittest.cc
@@ -1215,7 +1215,7 @@ TEST(NetUtilTest, GenerateSafeFileName) {
}
TEST(NetUtilTest, GenerateFileName) {
-#if defined(OS_POSIX) && !defined(OS_MACOSX)
+#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID)
// This test doesn't run when the locale is not UTF-8 because some of the
// string conversions fail. This is OK (we have the default value) but they
// don't match our expectations.
« net/base/host_resolver_impl.cc ('K') | « net/base/host_resolver_impl.cc ('k') | net/base/platform_mime_util_linux.cc » ('j') | net/base/platform_mime_util_linux.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698