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

Unified Diff: chrome/browser/net/connection_tester.cc

Issue 10389123: Fix unit-test build on Android. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 7 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/net/connection_tester.cc
diff --git a/chrome/browser/net/connection_tester.cc b/chrome/browser/net/connection_tester.cc
index eb250def8b64d92a5276cd02cc2acfc374c25c25..95920f5a2bcf80ff17198dc133e81a49c9713e7d 100644
--- a/chrome/browser/net/connection_tester.cc
+++ b/chrome/browser/net/connection_tester.cc
@@ -218,6 +218,7 @@ class ExperimentURLRequestContext : public net::URLRequestContext {
#endif
}
+#if !defined(OS_ANDROID)
static int FirefoxProxySettingsTask(
FirefoxProxySettings* firefox_settings) {
if (!FirefoxProxySettings::GetSettings(firefox_settings))
@@ -243,6 +244,7 @@ class ExperimentURLRequestContext : public net::URLRequestContext {
}
callback.Run(rv);
}
+#endif
// Creates a fixed proxy config service that is initialized using Firefox's
// current proxy settings. On success returns net::OK and fills
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698