net/base/dnsrr_resolver_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/dnsrr_resolver_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/dnsrr_resolver_unittest.cc

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

index ed5f2c59f59f089d63c05ef99d1cee0acf33a1e4..cc6e80b725cc0bd3e09a24e0880d4e0c301d823b 100644

--- a/net/base/dnsrr_resolver_unittest.cc

+++ b/net/base/dnsrr_resolver_unittest.cc

@@ -119,7 +119,7 @@ TEST(DnsRRResolverTest, Resolve) {

ASSERT_EQ(1u, resolver.inflight_joins());

}

-#if defined(OS_POSIX)

+#if defined(OS_POSIX) && !defined(OS_ANDROID)

// This is a DNS packet resulting from querying a recursive resolver for a TXT

// record for agl._pka.imperialviolet.org. You should be able to get a

// replacement from a packet capture should it ever be needed.