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

Unified Diff: net/base/dnsrr_resolver.cc

Issue 8429034: Upstream: Build net_unittests for Android. (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: split out unreviewed files 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
« no previous file with comments | « net/base/dnsrr_resolver.h ('k') | net/base/dnsrr_resolver_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/base/dnsrr_resolver.cc
diff --git a/net/base/dnsrr_resolver.cc b/net/base/dnsrr_resolver.cc
index 1d0956649df06ad942907eefea8a4599fc498b80..65ea8b65e4b3f5a01ac6fcb9ca9be16627a0d93c 100644
--- a/net/base/dnsrr_resolver.cc
+++ b/net/base/dnsrr_resolver.cc
@@ -176,7 +176,13 @@ class RRResolverWorker {
private:
-#if defined(OS_POSIX)
+#if defined(OS_ANDROID)
+
+ void Run() {
+ NOTIMPLEMENTED();
+ }
+
+#elif defined(OS_POSIX)
void Run() {
// Runs on a worker thread.
@@ -404,9 +410,9 @@ bool RRResponse::HasExpired(const base::Time current_time) const {
return current_time >= expiry;
}
+#if defined(OS_POSIX) && !defined(OS_ANDROID)
bool RRResponse::ParseFromResponse(const uint8* p, unsigned len,
uint16 rrtype_requested) {
-#if defined(OS_POSIX)
name.clear();
ttl = 0;
dnssec = false;
@@ -485,10 +491,10 @@ bool RRResponse::ParseFromResponse(const uint8* p, unsigned len,
signatures.push_back(std::string(rrdata.data(), rrdata.size()));
}
}
-#endif // defined(OS_POSIX)
return true;
}
+#endif // defined(OS_POSIX) && !defined(OS_ANDROID)
// An RRResolverJob is a one-to-one counterpart of an RRResolverWorker. It
« no previous file with comments | « net/base/dnsrr_resolver.h ('k') | net/base/dnsrr_resolver_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698