Display the "effective" proxy settings in about:net-internals.

The "effective" settings is what you get after applying the various fallbacks between automatic and manual settings.

This display makes it easier to notice whether "auto-detect" actually took effect, and if so what was the PAC URL it used.

BUG=53549
TEST=On windows change your proxy settings to include both auto-detect, a custom pac script, and some manually configured proxy servers. Now run chrome and go to the proxy tab on about:net-internals. Check that the "original" settings is what you entered in the dialog box, however the "effective" settings will only be a subset of them.
Review URL: http://codereview.chromium.org/3241002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@57767 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 3 insertions, 3 deletions

diff --git a/chrome/browser/net/preconnect.cc b/chrome/browser/net/preconnect.cc
index eef027e..c3c01eb 100644
--- a/chrome/browser/net/preconnect.cc
+++ b/chrome/browser/net/preconnect.cc
@@ -83,14 +83,14 @@ void Preconnect::Connect(const GURL& url) {
   } else {
     // Currently we avoid all preconnects if there is a proxy configuration.
     net::ProxyService* proxy_service = context->proxy_service();
-    if (!proxy_service->config_has_been_initialized()) {
+    if (!proxy_service->fetched_config().is_valid()) {
       HistogramPreconnectStatus(PROXY_UNINITIALIZED);
     } else {
-      if (proxy_service->config().MayRequirePACResolver()) {
+      if (proxy_service->fetched_config().MayRequirePACResolver()) {
         HistogramPreconnectStatus(PROXY_PAC_RESOLVER);
         return;
       }
-      if (!proxy_service->config().proxy_rules().empty()) {
+      if (!proxy_service->fetched_config().proxy_rules().empty()) {
         HistogramPreconnectStatus(PROXY_HAS_RULES);
         return;
       }