Allow ProxyConfigService to report "no configuration set"

chrome/browser/chromeos/proxy_config_service_impl_unittest.cc

-// Copyright (c) 2010 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 "chrome/browser/chromeos/proxy_config_service_impl.h"
 
 #include <map>
 #include <string>
 #include <vector>
 
 #include "base/format_macros.h"
@@ skipping 528 matching lines @@
   class ProxyChangedObserver : public net::ProxyConfigService::Observer {
    public:
     explicit ProxyChangedObserver(
         const scoped_refptr<ProxyConfigServiceImpl>& config_service)
         : config_service_(config_service) {
       config_service_->AddObserver(this);
     }
     virtual ~ProxyChangedObserver() {
       config_service_->RemoveObserver(this);
     }
+    net::ProxyConfigService::ConfigAvailability availability() const {
+      return availability_;
+    }
     const net::ProxyConfig& config() const {
       return config_;
     }
 
    private:
-    virtual void OnProxyConfigChanged(const net::ProxyConfig& config) {
+    virtual void OnProxyConfigChanged(
+        const net::ProxyConfig& config,
+        net::ProxyConfigService::ConfigAvailability availability) {
       config_ = config;
+      availability_ = availability;
     }
 
     scoped_refptr<ProxyConfigServiceImpl> config_service_;
+    net::ProxyConfigService::ConfigAvailability availability_;
     net::ProxyConfig config_;
   };
 
   // Init with direct.
   ProxyConfigServiceImpl::ProxyConfig init_config;
   SetAutomaticProxy(MK_MODE(DIRECT), MK_SRC(OWNER), NULL, &init_config,
                     &init_config.automatic_proxy);
   CreateConfigService(init_config);
 
   ProxyChangedObserver observer(config_service());
 
   // Set to pac script from UI.
   EXPECT_TRUE(config_service()->UISetProxyConfigToPACScript(
       GURL("http://wpad.dat")));
   // Retrieve config from IO thread.
   net::ProxyConfig io_config;
   SyncGetLatestProxyConfig(&io_config);
 
   // Observer should have gotten the same new proxy config.
+  EXPECT_EQ(net::ProxyConfigService::CONFIG_VALID, observer.availability());
   EXPECT_TRUE(io_config.Equals(observer.config()));
 }
 
 TEST_F(ProxyConfigServiceImplTest, SerializeAndDeserialize) {
   for (size_t i = 0; i < ARRAYSIZE_UNSAFE(tests); ++i) {
     if (!tests[i].is_valid)
       continue;
 
     SCOPED_TRACE(StringPrintf("Test[%" PRIuS "] %s", i,
                               tests[i].description.c_str()));
@@ skipping 62 matching lines @@
   TestReadWriteAccessForScheme(MK_SRC(POLICY), socks_uri, "socks");
 
   // Init with owner source.
   TestReadWriteAccessForScheme(MK_SRC(OWNER), http_uri, "http");
   TestReadWriteAccessForScheme(MK_SRC(OWNER), https_uri, "https");
   TestReadWriteAccessForScheme(MK_SRC(OWNER), ftp_uri, "ftp");
   TestReadWriteAccessForScheme(MK_SRC(OWNER), socks_uri, "socks");
 }
 
 }  // namespace chromeos