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

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

Issue 9559014: Exclude browser/importer from Android build. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Address Yarron's comment: move idef'd include to the bottom of the list Created 8 years, 10 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 | « chrome/browser/bookmarks/bookmark_extension_api.cc ('k') | chrome/chrome_browser.gypi » ('j') | 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 00e7482d8e9062cda4f1c80383d70c8638ec0e7e..13472decf1ea452ba1a7d16ddf18d04715544b73 100644
--- a/chrome/browser/net/connection_tester.cc
+++ b/chrome/browser/net/connection_tester.cc
@@ -12,7 +12,6 @@
#include "base/message_loop.h"
#include "base/threading/thread_restrictions.h"
#include "base/utf_string_conversions.h"
-#include "chrome/browser/importer/firefox_proxy_settings.h"
#include "chrome/common/chrome_switches.h"
#include "net/base/cert_verifier.h"
#include "net/base/cookie_monster.h"
@@ -34,6 +33,10 @@
#include "net/url_request/url_request_context.h"
#include "net/url_request/url_request_context_storage.h"
+#if !defined(OS_ANDROID)
+#include "chrome/browser/importer/firefox_proxy_settings.h"
+#endif
+
namespace {
// ExperimentURLRequestContext ------------------------------------------------
@@ -227,6 +230,10 @@ class ExperimentURLRequestContext : public net::URLRequestContext {
// code.
int CreateFirefoxProxyConfigService(
scoped_ptr<net::ProxyConfigService>* config_service) {
+#if defined(OS_ANDROID)
+ // Chrome on Android does not support Firefox settings.
+ return net::ERR_NOT_IMPLEMENTED;
+#else
// Fetch Firefox's proxy settings (can fail if Firefox is not installed).
FirefoxProxySettings firefox_settings;
if (!FirefoxProxySettings::GetSettings(&firefox_settings))
@@ -242,6 +249,7 @@ class ExperimentURLRequestContext : public net::URLRequestContext {
}
return net::ERR_FAILED;
+#endif
}
const scoped_refptr<net::URLRequestContext> proxy_request_context_;
« no previous file with comments | « chrome/browser/bookmarks/bookmark_extension_api.cc ('k') | chrome/chrome_browser.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698