summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authoreroman@chromium.org <eroman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-05-04 20:41:24 +0000
committereroman@chromium.org <eroman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-05-04 20:41:24 +0000
commit483bf127599968f88d42f4ae6fb62b4c30d4aba7 (patch)
tree78ef31c7971999504a85d15a1347c6c2b113258f /net
parentdffed056d438c98bad557de56e6da549c6912ca5 (diff)
downloadchromium_src-483bf127599968f88d42f4ae6fb62b4c30d4aba7.zip
chromium_src-483bf127599968f88d42f4ae6fb62b4c30d4aba7.tar.gz
chromium_src-483bf127599968f88d42f4ae6fb62b4c30d4aba7.tar.bz2
Add a tool for testing your network setup.
It runs a series of experiments using alternate network settings, to try and discover what the misconfiguration is. DESIGN=http://docs.google.com/Doc?id=dfhcnb2v_22cjtdznvg TEST=ConnectionTesterTest.* Review URL: http://codereview.chromium.org/1937001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@46387 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net')
-rw-r--r--net/proxy/proxy_config.h18
-rw-r--r--net/proxy/proxy_config_service_fixed.h1
-rw-r--r--net/url_request/url_request_context.h5
3 files changed, 22 insertions, 2 deletions
diff --git a/net/proxy/proxy_config.h b/net/proxy/proxy_config.h
index c641bbf..58e70e3 100644
--- a/net/proxy/proxy_config.h
+++ b/net/proxy/proxy_config.h
@@ -148,6 +148,24 @@ class ProxyConfig {
return auto_detect_;
}
+ // Helpers to construct some common proxy configurations.
+
+ static ProxyConfig CreateDirect() {
+ return ProxyConfig();
+ }
+
+ static ProxyConfig CreateAutoDetect() {
+ ProxyConfig config;
+ config.set_auto_detect(true);
+ return config;
+ }
+
+ static ProxyConfig CreateFromCustomPacURL(const GURL& pac_url) {
+ ProxyConfig config;
+ config.set_pac_url(pac_url);
+ return config;
+ }
+
private:
// True if the proxy configuration should be auto-detected.
bool auto_detect_;
diff --git a/net/proxy/proxy_config_service_fixed.h b/net/proxy/proxy_config_service_fixed.h
index 54fd9ac..b677eb4 100644
--- a/net/proxy/proxy_config_service_fixed.h
+++ b/net/proxy/proxy_config_service_fixed.h
@@ -6,6 +6,7 @@
#define NET_PROXY_PROXY_CONFIG_SERVICE_FIXED_H_
#include "net/base/net_errors.h"
+#include "net/proxy/proxy_config.h"
#include "net/proxy/proxy_config_service.h"
namespace net {
diff --git a/net/url_request/url_request_context.h b/net/url_request/url_request_context.h
index 070942f..cd1736b 100644
--- a/net/url_request/url_request_context.h
+++ b/net/url_request/url_request_context.h
@@ -30,13 +30,14 @@ class SocketStream;
class URLRequest;
// Subclass to provide application-specific context for URLRequest instances.
-class URLRequestContext :
- public base::RefCountedThreadSafe<URLRequestContext> {
+class URLRequestContext
+ : public base::RefCountedThreadSafe<URLRequestContext> {
public:
URLRequestContext()
: net_log_(NULL),
http_transaction_factory_(NULL),
ftp_transaction_factory_(NULL),
+ http_auth_handler_factory_(NULL),
cookie_policy_(NULL),
transport_security_state_(NULL) {
}