| 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 873af939cfba21a5923783a181c90fae8092d59e..730e003bd968005b9da7a81f12f217f4f9cc42e4 100644
|
| --- a/chrome/browser/chromeos/proxy_config_service_impl.h
|
| +++ b/chrome/browser/chromeos/proxy_config_service_impl.h
|
| @@ -15,7 +15,10 @@
|
| #include "chrome/browser/net/pref_proxy_config_tracker_impl.h"
|
|
|
| class PrefRegistrySimple;
|
| +
|
| +namespace user_prefs {
|
| class PrefRegistrySyncable;
|
| +}
|
|
|
| namespace chromeos {
|
|
|
| @@ -33,10 +36,9 @@ namespace chromeos {
|
| // - provides UI with methods to retrieve and modify proxy configuration for
|
| // any remembered network (either currently active or non-active) of current
|
| // user profile
|
| -class ProxyConfigServiceImpl
|
| - : public PrefProxyConfigTrackerImpl,
|
| - public NetworkLibrary::NetworkManagerObserver,
|
| - public NetworkLibrary::NetworkObserver {
|
| +class ProxyConfigServiceImpl : public PrefProxyConfigTrackerImpl,
|
| + public NetworkLibrary::NetworkManagerObserver,
|
| + public NetworkLibrary::NetworkObserver {
|
| public:
|
| // ProxyConfigServiceImpl is created in ProxyServiceFactory::
|
| // CreatePrefProxyConfigTrackerImpl via Profile::GetProxyConfigTracker() for
|
| @@ -203,7 +205,7 @@ class ProxyConfigServiceImpl
|
|
|
| // Register UseShardProxies preference.
|
| static void RegisterPrefs(PrefRegistrySimple* registry);
|
| - static void RegisterUserPrefs(PrefRegistrySyncable* registry);
|
| + static void RegisterUserPrefs(user_prefs::PrefRegistrySyncable* registry);
|
|
|
| #if defined(UNIT_TEST)
|
| void SetTesting(ProxyConfig* test_config) {
|
|
|