Allow ProxyConfigService to report "no configuration set"

net/proxy/proxy_service_unittest.cc

 // 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_service.h"
 
 #include <vector>
 
 #include "base/format_macros.h"
 #include "base/logging.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "googleurl/src/gurl.h"
+#include "net/base/net_errors.h"
 #include "net/base/net_log.h"
 #include "net/base/net_log_unittest.h"
-#include "net/base/net_errors.h"
 #include "net/base/test_completion_callback.h"
 #include "net/proxy/mock_proxy_resolver.h"
 #include "net/proxy/proxy_config_service.h"
 #include "net/proxy/proxy_resolver.h"
 #include "net/proxy/proxy_script_fetcher.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 // TODO(eroman): Write a test which exercises
 //              ProxyService::SuspendAllPendingRequests().
 namespace net {
 namespace {
 
 class MockProxyConfigService: public ProxyConfigService {
  public:
   explicit MockProxyConfigService(const ProxyConfig& config)
-      : has_config_(true), config_(config) {
+      : availability_(CONFIG_VALID),
+        config_(config) {
   }
 
   explicit MockProxyConfigService(const std::string& pac_url)
-      : has_config_(true),
+      : availability_(CONFIG_VALID),
         config_(ProxyConfig::CreateFromCustomPacURL(GURL(pac_url))) {
   }
 
   virtual void AddObserver(Observer* observer) {
     observers_.AddObserver(observer);
   }
 
   virtual void RemoveObserver(Observer* observer) {
     observers_.RemoveObserver(observer);
   }
 
-  virtual bool GetLatestProxyConfig(ProxyConfig* results) {
-    if (has_config_) {
+  virtual ConfigAvailability GetLatestProxyConfig(ProxyConfig* results) {
+    if (availability_ == CONFIG_VALID)
       *results = config_;
-      return true;
-    }
-    return false;
+    return availability_;
   }
 
   void SetConfig(const ProxyConfig& config) {
-    has_config_ = true;
+    availability_ = CONFIG_VALID;
     config_ = config;
-    FOR_EACH_OBSERVER(Observer, observers_, OnProxyConfigChanged(config));
+    FOR_EACH_OBSERVER(Observer, observers_,
+                      OnProxyConfigChanged(config_, availability_));
   }
 
  private:
-  bool has_config_;
+  ConfigAvailability availability_;
   ProxyConfig config_;
   ObserverList<Observer, true> observers_;
 };
 
 }  // namespace
 
 // A mock ProxyScriptFetcher. No result will be returned to the fetch client
 // until we call NotifyFetchCompletion() to set the results.
 class MockProxyScriptFetcher : public ProxyScriptFetcher {
  public:
@@ skipping 1620 matching lines @@
   log.GetEntries(&entries);
 
   EXPECT_TRUE(LogContainsEntryWithType(entries, 0,
                                        NetLog::TYPE_PROXY_CONFIG_CHANGED));
   ASSERT_EQ(13u, entries.size());
   for (size_t i = 1; i < entries.size(); ++i)
     EXPECT_NE(NetLog::TYPE_PROXY_CONFIG_CHANGED, entries[i].type);
 }
 
 }  // namespace net