Allow ProxyConfigService to report "no configuration set"

chrome/browser/chromeos/proxy_config_service_impl.h

 // 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.
 
 #ifndef CHROME_BROWSER_CHROMEOS_PROXY_CONFIG_SERVICE_IMPL_H_
 #define CHROME_BROWSER_CHROMEOS_PROXY_CONFIG_SERVICE_IMPL_H_
 #pragma once
 
 #include <string>
 #include <vector>
@@ skipping 21 matching lines @@
 // - provides UI with methods to retrieve and modify system proxy configuration
 //   on UI thread
 // - TODO(kuan): persists proxy configuration settings on chromeos device using
 //   cros settings
 class ProxyConfigServiceImpl
     : public base::RefCountedThreadSafe<ProxyConfigServiceImpl>,
       public SignedSettings::Delegate<bool>,
       public SignedSettings::Delegate<std::string> {
  public:
   // ProxyConfigServiceImpl is created on the UI thread in
-  // chrome/browser/net/chrome_url_request_context.cc::CreateProxyConfigService
-  // via ProfileImpl::GetChromeOSProxyConfigServiceImpl, and stored in Profile
-  // as a scoped_refptr (because it's RefCountedThreadSafe).
+  // ProfileIOData::CreateProxyConfigService via
+  // ProfileImpl::GetChromeOSProxyConfigServiceImpl, and stored in Profile as a
+  // scoped_refptr (because it's RefCountedThreadSafe).
   //
   // Past that point, it can be accessed from the IO or UI threads.
   //
   // From the IO thread, it is accessed periodically through the wrapper class
   // chromeos::ProxyConfigService via net::ProxyConfigService interface
   // (GetLatestProxyConfig, AddObserver, RemoveObserver).
   //
   // From the UI thread, it is accessed via
   // WebUI::GetProfile::GetChromeOSProxyConfigServiceImpl to allow user to read
   // or modify the proxy configuration via UIGetProxyConfig or
@@ skipping 115 matching lines @@
   // Constructor for testing.
   // |init_config| specifies the ProxyConfig to use for initialization.
   explicit ProxyConfigServiceImpl(const ProxyConfig& init_config);
   virtual ~ProxyConfigServiceImpl();
 
   // Methods called on IO thread from wrapper class chromeos::ProxyConfigService
   // as ProxyConfigService methods.
   void AddObserver(net::ProxyConfigService::Observer* observer);
   void RemoveObserver(net::ProxyConfigService::Observer* observer);
   // Called from GetLatestProxyConfig.
-  bool IOGetProxyConfig(net::ProxyConfig* config);
+  net::ProxyConfigService::ConfigAvailability IOGetProxyConfig(
+      net::ProxyConfig* config);
 
   // Called from UI thread to retrieve proxy configuration in |config|.
   void UIGetProxyConfig(ProxyConfig* config);
 
   // Called from UI thread to set flag to persist settings to device.
   // Subsequent UISet* methods will use this flag, until UI calls it again with
   // a different flag.
   void UISetPersistToDevice(bool persist) {
     persist_to_device_ = persist;
   }
@@ skipping 17 matching lines @@
 
   // Implementation for SignedSettings::Delegate
   virtual void OnSettingsOpCompleted(SignedSettings::ReturnCode code,
                                      std::string value);
   virtual void OnSettingsOpCompleted(SignedSettings::ReturnCode code,
                                      bool value);
 
  private:
   friend class base::RefCountedThreadSafe<ProxyConfigServiceImpl>;
 
-  // Init proxy to default config, i.e. AutoDetect.
-  // If |post_to_io_thread| is true, a task will be posted to IO thread to
-  // update |cached_config|.
-  void InitConfigToDefault(bool post_to_io_thread);
-
   // Persists proxy config to device.
   void PersistConfigToDevice();
 
   // Called from UI thread from the various UISetProxyConfigTo*
   // |update_to_device| is true to persist new proxy config to device.
   void OnUISetProxyConfig(bool update_to_device);
 
   // Posted from UI thread to IO thread to carry the new config information.
-  void IOSetProxyConfig(const ProxyConfig& new_config);
+  void IOSetProxyConfig(
+      const ProxyConfig& new_config,
+      net::ProxyConfigService::ConfigAvailability new_availability);
 
   // Checks that method is called on BrowserThread::IO thread.
   void CheckCurrentlyOnIOThread();
 
   // Checks that method is called on BrowserThread::UI thread.
   void CheckCurrentlyOnUIThread();
 
   // Data members.
 
   // True if tasks can be posted, which can only happen if constructor has
   // completed (NewRunnableMethod cannot be created for a RefCountedThreadBase's
   // method until the class's ref_count is at least one).
   bool can_post_task_;
 
-  // True if config has been fetched from device or initialized properly.
-  bool has_config_;
+  // Availability status of the configuration.
+  net::ProxyConfigService::ConfigAvailability config_availability_;
 
   // True if settings are to be persisted to device.
   bool persist_to_device_;
 
   // True if there's a pending operation to store proxy setting to device.
   bool persist_to_device_pending_;
 
   // Cached proxy configuration, to be converted to net::ProxyConfig and
   // returned by IOGetProxyConfig.
   // Initially populated from the UI thread, but afterwards only accessed from
@@ skipping 12 matching lines @@
   // respectively.
   scoped_refptr<SignedSettings> retrieve_property_op_;
   scoped_refptr<SignedSettings> store_property_op_;
 
   DISALLOW_COPY_AND_ASSIGN(ProxyConfigServiceImpl);
 };
 
 }  // namespace chromeos
 
 #endif  // CHROME_BROWSER_CHROMEOS_PROXY_CONFIG_SERVICE_IMPL_H_