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 aa91b686c4e7fd755c5732a2ce3424802fc8d8da..1471279d853f3e14d4d9f94d700ec5f70761d745 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,8 +55,7 @@ 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*> KeyEntryList;

[eroman, 2014/10/10 21:34:35]

Can you rename this to RegKeyList ?

[rvargas (doing something else), 2014/10/10 22:22:05]

Done.

 
   // Registers change observers on the registry keys relating to proxy settings.
   void StartWatchingRegistryForChanges();
@@ -63,7 +66,7 @@ class NET_EXPORT_PRIVATE ProxyConfigServiceWin
 
   // ObjectWatcher::Delegate methods:

[eroman, 2014/10/10 21:34:36]

This line is no longer applicable.

[rvargas (doing something else), 2014/10/10 22:22:05]

Done.

   // 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);