Index: components/proxy_config/pref_proxy_config_tracker_impl.h |
diff --git a/components/proxy_config/pref_proxy_config_tracker_impl.h b/components/proxy_config/pref_proxy_config_tracker_impl.h |
index ec42a7922179569ea2f3d8d05ecacf64b131941a..3c5f888a6d92bf7872e4a9acb993970aab97cb18 100644 |
--- a/components/proxy_config/pref_proxy_config_tracker_impl.h |
+++ b/components/proxy_config/pref_proxy_config_tracker_impl.h |
@@ -37,9 +37,9 @@ class ProxyConfigServiceImpl : public net::ProxyConfigService, |
public net::ProxyConfigService::Observer { |
public: |
// Takes ownership of the passed |base_service|. |
eroman
2017/05/12 21:54:55
You can delete this comment now.
mmenke
2017/05/12 21:57:58
Thanks, will do!
|
- // GetLatestProxyConfig returns ConfigAvailability::CONFIG_PENDING until |
- // UpdateProxyConfig has been called. |
- explicit ProxyConfigServiceImpl(net::ProxyConfigService* base_service); |
+ ProxyConfigServiceImpl(std::unique_ptr<net::ProxyConfigService> base_service, |
+ ProxyPrefs::ConfigState initial_config_state, |
+ const net::ProxyConfig& initial_config); |
~ProxyConfigServiceImpl() override; |
// ProxyConfigService implementation: |
@@ -71,10 +71,6 @@ class ProxyConfigServiceImpl : public net::ProxyConfigService, |
// Configuration as defined by prefs. |
net::ProxyConfig pref_config_; |
- // Flag that indicates that a PrefProxyConfigTracker needs to inform us |
- // about a proxy configuration before we may return any configuration. |
- bool pref_config_read_pending_; |
- |
// Indicates whether the base service registration is done. |
bool registered_observer_; |