| Index: chrome/browser/chromeos/proxy_config_service_impl.h
|
| diff --git a/chrome/browser/chromeos/proxy_config_service_impl.h b/chrome/browser/chromeos/proxy_config_service_impl.h
|
| index 2b43064ffcf13cc392cdb0e273a8d181539d03c4..75a6dce2e02562b7058e088afe90badeedcec419 100644
|
| --- a/chrome/browser/chromeos/proxy_config_service_impl.h
|
| +++ b/chrome/browser/chromeos/proxy_config_service_impl.h
|
| @@ -63,10 +63,11 @@ class ProxyConfigServiceImpl : public PrefProxyConfigTrackerImpl,
|
|
|
| // Returns Pref Proxy configuration if available or a proxy config dictionary
|
| // applied to the default network.
|
| - // Returns NULL if no Pref Proxy configuration and no active network.
|
| - // |profile_prefs| must be not NULL.
|
| + // Returns null if no Pref Proxy configuration and no active network.
|
| + // |profile_prefs| and |local_state_prefs| must be not null.
|
| static std::unique_ptr<ProxyConfigDictionary> GetActiveProxyConfigDictionary(
|
| - const PrefService* profile_prefs);
|
| + const PrefService* profile_prefs,
|
| + const PrefService* local_state_prefs);
|
|
|
| private:
|
| // Called when any proxy preference changes.
|
|
|