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

6 files changed, 15 insertions, 15 deletions

diff --git a/net/base/listen_socket.h b/net/base/listen_socket.h
index e730b82..641ae51 100644
--- a/net/base/listen_socket.h
+++ b/net/base/listen_socket.h
@@ -19,7 +19,7 @@
 #endif
 #include <string>
 #if defined(OS_WIN)
-#include "base/object_watcher.h"
+#include "base/win/object_watcher.h"
 #elif defined(OS_POSIX)
 #include "base/message_loop.h"
 #endif
@@ -35,7 +35,7 @@ typedef int SOCKET;
 // Implements a raw socket interface
 class ListenSocket : public base::RefCountedThreadSafe<ListenSocket>,
 #if defined(OS_WIN)
-                     public base::ObjectWatcher::Delegate
+                     public base::win::ObjectWatcher::Delegate
 #elif defined(OS_POSIX)
                      public MessageLoopForIO::Watcher
 #endif
@@ -107,7 +107,7 @@ class ListenSocket : public base::RefCountedThreadSafe<ListenSocket>,
 #if defined(OS_WIN)
   // ObjectWatcher delegate
   virtual void OnObjectSignaled(HANDLE object);
-  base::ObjectWatcher watcher_;
+  base::win::ObjectWatcher watcher_;
   HANDLE socket_event_;
 #elif defined(OS_POSIX)
   WaitState wait_state_;
diff --git a/net/base/network_change_notifier_win.h b/net/base/network_change_notifier_win.h
index 44782c7..c76f7fd 100644
--- a/net/base/network_change_notifier_win.h
+++ b/net/base/network_change_notifier_win.h
@@ -9,13 +9,13 @@
 #include <windows.h>
 
 #include "base/basictypes.h"
-#include "base/object_watcher.h"
+#include "base/win/object_watcher.h"
 #include "net/base/network_change_notifier.h"
 
 namespace net {
 
 class NetworkChangeNotifierWin : public NetworkChangeNotifier,
-                                 public base::ObjectWatcher::Delegate {
+                                 public base::win::ObjectWatcher::Delegate {
  public:
   NetworkChangeNotifierWin();
 
@@ -31,7 +31,7 @@ class NetworkChangeNotifierWin : public NetworkChangeNotifier,
   // Begins listening for a single subsequent address change.
   void WatchForAddressChange();
 
-  base::ObjectWatcher addr_watcher_;
+  base::win::ObjectWatcher addr_watcher_;
   OVERLAPPED addr_overlapped_;
 
   DISALLOW_COPY_AND_ASSIGN(NetworkChangeNotifierWin);
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();
diff --git a/net/socket/tcp_client_socket_win.cc b/net/socket/tcp_client_socket_win.cc
index a1d99e6..e8b2f53 100644
--- a/net/socket/tcp_client_socket_win.cc
+++ b/net/socket/tcp_client_socket_win.cc
@@ -10,6 +10,7 @@
 #include "base/metrics/stats_counters.h"
 #include "base/string_util.h"
 #include "base/sys_info.h"
+#include "base/win/object_watcher.h"
 #include "net/base/address_list_net_log_param.h"
 #include "net/base/connection_type_histograms.h"
 #include "net/base/io_buffer.h"
@@ -170,7 +171,7 @@ class TCPClientSocketWin::Core : public base::RefCounted<Core> {
  private:
   friend class base::RefCounted<Core>;
 
-  class ReadDelegate : public base::ObjectWatcher::Delegate {
+  class ReadDelegate : public base::win::ObjectWatcher::Delegate {
    public:
     explicit ReadDelegate(Core* core) : core_(core) {}
     virtual ~ReadDelegate() {}
@@ -182,7 +183,7 @@ class TCPClientSocketWin::Core : public base::RefCounted<Core> {
     Core* const core_;
   };
 
-  class WriteDelegate : public base::ObjectWatcher::Delegate {
+  class WriteDelegate : public base::win::ObjectWatcher::Delegate {
    public:
     explicit WriteDelegate(Core* core) : core_(core) {}
     virtual ~WriteDelegate() {}
@@ -205,9 +206,9 @@ class TCPClientSocketWin::Core : public base::RefCounted<Core> {
   WriteDelegate writer_;
 
   // |read_watcher_| watches for events from Connect() and Read().
-  base::ObjectWatcher read_watcher_;
+  base::win::ObjectWatcher read_watcher_;
   // |write_watcher_| watches for events from Write();
-  base::ObjectWatcher write_watcher_;
+  base::win::ObjectWatcher write_watcher_;
 
   // When doing reads from the socket, we try to mirror TCP's slow start.
   // We do this because otherwise the async IO subsystem artifically delays
diff --git a/net/socket/tcp_client_socket_win.h b/net/socket/tcp_client_socket_win.h
index 041c123..aa8abd1 100644
--- a/net/socket/tcp_client_socket_win.h
+++ b/net/socket/tcp_client_socket_win.h
@@ -8,7 +8,6 @@
 
 #include <winsock2.h>
 
-#include "base/object_watcher.h"
 #include "base/threading/non_thread_safe.h"
 #include "net/base/address_list.h"
 #include "net/base/completion_callback.h"