diff options
| author | robertshield@google.com <robertshield@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-12 15:07:50 +0000 |
|---|---|---|
| committer | robertshield@google.com <robertshield@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-12 15:07:50 +0000 |
| commit | ab501a6a67596eb43d233f91f7500779dcbe8740 (patch) | |
| tree | 90bfc9f94bf80c4ed7081d8d54454f02075c3c26 /net/net.gyp | |
| parent | 481fe3bfb2359849d1d3fc9d0ceba4161fbb5a3e (diff) | |
| download | chromium_src-ab501a6a67596eb43d233f91f7500779dcbe8740.zip chromium_src-ab501a6a67596eb43d233f91f7500779dcbe8740.tar.gz chromium_src-ab501a6a67596eb43d233f91f7500779dcbe8740.tar.bz2 | |
Making command-line specified proxy settings more flexible - allowing for setting of auto-detect, pac url, per-schema proxy settings, proxy bypass urls.
BUG=http://crbug.com/266
Review URL: http://codereview.chromium.org/115029
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@15855 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/net.gyp')
| -rw-r--r-- | net/net.gyp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/net.gyp b/net/net.gyp index a87029c..8c11266 100644 --- a/net/net.gyp +++ b/net/net.gyp @@ -444,7 +444,6 @@ 'http/http_transaction_unittest.h', 'http/http_util_unittest.cc', 'http/http_vary_data_unittest.cc', - 'proxy/proxy_config_service_common_unittest.cc', 'proxy/proxy_config_service_common_unittest.h', 'proxy/proxy_config_service_linux_unittest.cc', 'proxy/proxy_config_service_win_unittest.cc', @@ -570,6 +569,8 @@ 'sources': [ 'disk_cache/disk_cache_test_util.cc', 'disk_cache/disk_cache_test_util.h', + 'proxy/proxy_config_service_common_unittest.cc', + 'proxy/proxy_config_service_common_unittest.h', ], }, { |