Remove raw handles from base::win::RegKey

net/proxy/proxy_config_service_win.h

Index: net/proxy/proxy_config_service_win.h
diff --git a/net/proxy/proxy_config_service_win.h b/net/proxy/proxy_config_service_win.h
index 62f1f120c74c265f40a64b3ed98aedb522751bf1..52c389574d4056862aedb7d3543e594be45b77be 100644
--- a/net/proxy/proxy_config_service_win.h
+++ b/net/proxy/proxy_config_service_win.h
@@ -12,9 +12,14 @@
 
 #include "base/compiler_specific.h"
 #include "base/gtest_prod_util.h"
-#include "base/win/object_watcher.h"
 #include "net/proxy/polling_proxy_config_service.h"
 
+namespace base {
+namespace win {
+class RegKey;
+}
+}  // namespace base.
+
 namespace net {
 
 // Implementation of ProxyConfigService that retrieves the system proxy
@@ -40,8 +45,7 @@ namespace net {
 // change, or in case we got it wrong (and are not checking all possible
 // registry dependencies).
 class NET_EXPORT_PRIVATE ProxyConfigServiceWin
-    : public PollingProxyConfigService,
-      public base::win::ObjectWatcher::Delegate {
+    : public PollingProxyConfigService {
  public:
   ProxyConfigServiceWin();
   virtual ~ProxyConfigServiceWin();
@@ -51,19 +55,17 @@ class NET_EXPORT_PRIVATE ProxyConfigServiceWin
 
  private:
   FRIEND_TEST_ALL_PREFIXES(ProxyConfigServiceWinTest, SetFromIEConfig);
-  class KeyEntry;
-  typedef std::vector<KeyEntry*> KeyEntryList;
+  typedef std::vector<base::win::RegKey*> RegKeyList;
 
   // Registers change observers on the registry keys relating to proxy settings.
   void StartWatchingRegistryForChanges();
 
-  // Creates a new KeyEntry and appends it to |keys_to_watch_|. If the key
-  // fails to be created, it is not appended to the list and we return false.
+  // Creates a new key and appends it to |keys_to_watch_|. If the key fails to
+  // be created, it is not appended to the list and we return false.
   bool AddKeyToWatchList(HKEY rootkey, const wchar_t* subkey);
 
-  // ObjectWatcher::Delegate methods:
   // This is called whenever one of the registry keys we are watching change.
-  virtual void OnObjectSignaled(HANDLE object) override;
+  void OnObjectSignaled(base::win::RegKey* key);
 
   static void GetCurrentProxyConfig(ProxyConfig* config);
 
@@ -72,7 +74,7 @@ class NET_EXPORT_PRIVATE ProxyConfigServiceWin
       ProxyConfig* config,
       const WINHTTP_CURRENT_USER_IE_PROXY_CONFIG& ie_config);
 
-  KeyEntryList keys_to_watch_;
+  RegKeyList keys_to_watch_;
 };
 
 }  // namespace net