net/base/net_util_unittest.cc - Issue 8429034: Upstream: Build net_unittests for Android.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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: fix a bug in ssl_client_socket_openssl.cc and 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:

Index: net/base/net_util_unittest.cc

diff --git a/net/base/net_util_unittest.cc b/net/base/net_util_unittest.cc

index 88c987eee1d14b86b19e781f408f83c1f84ad7b8..77393f491c39b8a93fb7ebc291c40a7a267325e6 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.