summaryrefslogtreecommitdiffstats
path: root/net/net.gyp
diff options
context:
space:
mode:
authorasanka@chromium.org <asanka@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-06-12 23:32:51 +0000
committerasanka@chromium.org <asanka@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-06-12 23:32:51 +0000
commitdb8ff912c0325d5bbff4b989de637ee371d09406 (patch)
treed76d169b88f42e8a53e193afddc851012bb5d122 /net/net.gyp
parent72cf3215b9359e1f7c454e9d3f281edef5bf3fc7 (diff)
downloadchromium_src-db8ff912c0325d5bbff4b989de637ee371d09406.zip
chromium_src-db8ff912c0325d5bbff4b989de637ee371d09406.tar.gz
chromium_src-db8ff912c0325d5bbff4b989de637ee371d09406.tar.bz2
Track sources of proxy settings.
ProxyConfig keeps track of the source of proxy settings. During proxy resolution ProxyService tags the resulting ProxyInfo with the same source information. BUG=none TEST=net_unittests Review URL: https://chromiumcodereview.appspot.com/10310179 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@141784 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/net.gyp')
-rw-r--r--net/net.gyp3
1 files changed, 3 insertions, 0 deletions
diff --git a/net/net.gyp b/net/net.gyp
index af65034..6820b7a 100644
--- a/net/net.gyp
+++ b/net/net.gyp
@@ -557,6 +557,8 @@
'proxy/proxy_config_service_mac.h',
'proxy/proxy_config_service_win.cc',
'proxy/proxy_config_service_win.h',
+ 'proxy/proxy_config_source.cc',
+ 'proxy/proxy_config_source.h',
'proxy/proxy_info.cc',
'proxy/proxy_info.h',
'proxy/proxy_list.cc',
@@ -1184,6 +1186,7 @@
'proxy/proxy_config_service_linux_unittest.cc',
'proxy/proxy_config_service_win_unittest.cc',
'proxy/proxy_config_unittest.cc',
+ 'proxy/proxy_info_unittest.cc',
'proxy/proxy_list_unittest.cc',
'proxy/proxy_resolver_js_bindings_unittest.cc',
'proxy/proxy_resolver_v8_unittest.cc',