2 files changed, 33 insertions, 8 deletions
diff --git a/net/proxy/proxy_config_service_mac.cc b/net/proxy/proxy_config_service_mac.cc
index 84a5da3..a197313 100644
--- a/net/proxy/proxy_config_service_mac.cc
+++ b/net/proxy/proxy_config_service_mac.cc
@@ -186,7 +186,9 @@ class ProxyConfigServiceMac::Helper
 };
 
 ProxyConfigServiceMac::ProxyConfigServiceMac(MessageLoop* io_loop)
-    : has_fetched_config_(false),
+    : forwarder_(this),
+      config_watcher_(&forwarder_),
+      has_fetched_config_(false),
       helper_(new Helper(this)),
       io_loop_(io_loop) {
   DCHECK(io_loop);
@@ -223,6 +225,8 @@ bool ProxyConfigServiceMac::GetLatestProxyConfig(ProxyConfig* config) {
 
 void ProxyConfigServiceMac::SetDynamicStoreNotificationKeys(
     SCDynamicStoreRef store) {
+  // Called on notifier thread.
+
   CFStringRef proxies_key = SCDynamicStoreKeyCreateProxies(NULL);
   CFArrayRef key_array = CFArrayCreate(
       NULL, (const void **)(&proxies_key), 1, &kCFTypeArrayCallBacks);
diff --git a/net/proxy/proxy_config_service_mac.h b/net/proxy/proxy_config_service_mac.h
index fd2d524..ede8c5e 100644
--- a/net/proxy/proxy_config_service_mac.h
+++ b/net/proxy/proxy_config_service_mac.h
@@ -15,8 +15,7 @@
 
 namespace net {
 
-class ProxyConfigServiceMac : public ProxyConfigService,
-                              public NetworkConfigWatcherMac {
+class ProxyConfigServiceMac : public ProxyConfigService {
  public:
   // Constructs a ProxyConfigService that watches the Mac OS system settings.
   // This instance is expected to be operated and deleted on |io_loop|
@@ -30,17 +29,39 @@ class ProxyConfigServiceMac : public ProxyConfigService,
   virtual void RemoveObserver(Observer* observer);
   virtual bool GetLatestProxyConfig(ProxyConfig* config);
 
- protected:
-  // NetworkConfigWatcherMac implementation:
-  virtual void SetDynamicStoreNotificationKeys(SCDynamicStoreRef store);
-  virtual void OnNetworkConfigChange(CFArrayRef changed_keys);
-
  private:
   class Helper;
 
+  // Forwarder just exists to keep the NetworkConfigWatcherMac API out of
+  // ProxyConfigServiceMac's public API.
+  class Forwarder : public NetworkConfigWatcherMac::Delegate {
+   public:
+    explicit Forwarder(ProxyConfigServiceMac* net_config_watcher)
+        : net_config_watcher_(net_config_watcher_) {}
+
+    // NetworkConfigWatcherMac::Delegate implementation:
+    virtual void SetDynamicStoreNotificationKeys(SCDynamicStoreRef store) {
+      net_config_watcher_->SetDynamicStoreNotificationKeys(store);
+    }
+    virtual void OnNetworkConfigChange(CFArrayRef changed_keys) {
+      net_config_watcher_->OnNetworkConfigChange(changed_keys);
+    }
+
+   private:
+    ProxyConfigServiceMac* const net_config_watcher_;
+    DISALLOW_COPY_AND_ASSIGN(Forwarder);
+  };
+
+  // NetworkConfigWatcherMac::Delegate implementation:
+  void SetDynamicStoreNotificationKeys(SCDynamicStoreRef store);
+  void OnNetworkConfigChange(CFArrayRef changed_keys);
+
   // Called when the proxy configuration has changed, to notify the observers.
   void OnProxyConfigChanged(const ProxyConfig& new_config);
 
+  Forwarder forwarder_;
+  const NetworkConfigWatcherMac config_watcher_;
+
   ObserverList<Observer> observers_;
 
   // Holds the last system proxy settings that we fetched.