move base/object_watcher into base/win and add the win namespace. Fixup callers.

TEST=it compiles
BUG=none
Review URL: http://codereview.chromium.org/5971008

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@70360 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 4 insertions, 4 deletions

diff --git a/net/proxy/proxy_config_service_win.cc b/net/proxy/proxy_config_service_win.cc
index 914a319..849fc24 100644
--- a/net/proxy/proxy_config_service_win.cc
+++ b/net/proxy/proxy_config_service_win.cc
@@ -39,7 +39,7 @@ void FreeIEConfig(WINHTTP_CURRENT_USER_IE_PROXY_CONFIG* ie_config) {
 // RegKey and ObjectWatcher pair.
 class ProxyConfigServiceWin::KeyEntry {
  public:
-  bool StartWatching(base::ObjectWatcher::Delegate* delegate) {
+  bool StartWatching(base::win::ObjectWatcher::Delegate* delegate) {
     // Try to create a watch event for the registry key (which watches the
     // sibling tree as well).
     if (!key_.StartWatching())
@@ -63,7 +63,7 @@ class ProxyConfigServiceWin::KeyEntry {
 
  private:
   base::win::RegKey key_;
-  base::ObjectWatcher watcher_;
+  base::win::ObjectWatcher watcher_;
 };
 
 ProxyConfigServiceWin::ProxyConfigServiceWin()
diff --git a/net/proxy/proxy_config_service_win.h b/net/proxy/proxy_config_service_win.h
index e10e9a0..dc1da12 100644
--- a/net/proxy/proxy_config_service_win.h
+++ b/net/proxy/proxy_config_service_win.h
@@ -12,7 +12,7 @@
 #include <vector>
 
 #include "base/gtest_prod_util.h"
-#include "base/object_watcher.h"
+#include "base/win/object_watcher.h"
 #include "net/proxy/polling_proxy_config_service.h"
 
 namespace net {
@@ -40,7 +40,7 @@ namespace net {
 // change, or in case we got it wrong (and are not checking all possible
 // registry dependencies).
 class ProxyConfigServiceWin : public PollingProxyConfigService,
-                              public base::ObjectWatcher::Delegate {
+                              public base::win::ObjectWatcher::Delegate {
  public:
   ProxyConfigServiceWin();
   virtual ~ProxyConfigServiceWin();