Allow ProxyConfigService to report "no configuration set"

net/proxy/proxy_config_service_win.cc

-// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "net/proxy/proxy_config_service_win.h"
 
 #include <windows.h>
 #include <winhttp.h>
 
 #include "base/logging.h"
 #include "base/scoped_ptr.h"
@@ skipping 134 matching lines @@
 
   // Keep watching the registry key.
   if (!(*it)->StartWatching(this))
     keys_to_watch_.erase(it);
 
   // Have the PollingProxyConfigService test for changes.
   CheckForChangesNow();
 }
 
 // static
-void ProxyConfigServiceWin::GetCurrentProxyConfig(ProxyConfig* config) {
+ProxyConfigService::ConfigAvailability
+    ProxyConfigServiceWin::GetCurrentProxyConfig(ProxyConfig* config) {
   WINHTTP_CURRENT_USER_IE_PROXY_CONFIG ie_config = {0};
   if (!WinHttpGetIEProxyConfigForCurrentUser(&ie_config)) {
     LOG(ERROR) << "WinHttpGetIEProxyConfigForCurrentUser failed: " <<
         GetLastError();
     *config = ProxyConfig::CreateDirect();
-    return;
+    return CONFIG_UNSET;

[eroman, 2011/03/16 01:30:00]

See my previous comment -- i don't think we should ever return UNSET, but should
simply fall-back to direct here. The "system" always has settings, they just
might be weird.

[Mattias Nissler (ping if slow), 2011/03/16 17:40:00]

Done.

   }
   SetFromIEConfig(config, ie_config);
   FreeIEConfig(&ie_config);
+  return CONFIG_VALID;
 }
 
 // static
 void ProxyConfigServiceWin::SetFromIEConfig(
     ProxyConfig* config,
     const WINHTTP_CURRENT_USER_IE_PROXY_CONFIG& ie_config) {
   if (ie_config.fAutoDetect)
     config->set_auto_detect(true);
   if (ie_config.lpszProxy) {
     // lpszProxy may be a single proxy, or a proxy per scheme. The format
     // is compatible with ProxyConfig::ProxyRules's string format.
     config->proxy_rules().ParseFromString(WideToASCII(ie_config.lpszProxy));
   }
   if (ie_config.lpszProxyBypass) {
     std::string proxy_bypass = WideToASCII(ie_config.lpszProxyBypass);
 
     StringTokenizer proxy_server_bypass_list(proxy_bypass, "; \t\n\r");
     while (proxy_server_bypass_list.GetNext()) {
       std::string bypass_url_domain = proxy_server_bypass_list.token();
       config->proxy_rules().bypass_rules.AddRuleFromString(bypass_url_domain);
     }
   }
   if (ie_config.lpszAutoConfigUrl)
     config->set_pac_url(GURL(ie_config.lpszAutoConfigUrl));
 }
 
 }  // namespace net