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, 21 insertions, 20 deletions

diff --git a/chrome/browser/file_path_watcher/file_path_watcher_win.cc b/chrome/browser/file_path_watcher/file_path_watcher_win.cc
index 57294d4..c2f49b9 100644
--- a/chrome/browser/file_path_watcher/file_path_watcher_win.cc
+++ b/chrome/browser/file_path_watcher/file_path_watcher_win.cc
@@ -7,14 +7,14 @@
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/logging.h"
-#include "base/object_watcher.h"
 #include "base/ref_counted.h"
 #include "base/time.h"
+#include "base/win/object_watcher.h"
 
 namespace {
 
 class FilePathWatcherImpl : public FilePathWatcher::PlatformDelegate,
-                            public base::ObjectWatcher::Delegate {
+                            public base::win::ObjectWatcher::Delegate {
  public:
   FilePathWatcherImpl() : delegate_(NULL), handle_(INVALID_HANDLE_VALUE) {}
 
@@ -49,7 +49,7 @@ class FilePathWatcherImpl : public FilePathWatcher::PlatformDelegate,
   HANDLE handle_;
 
   // ObjectWatcher to watch handle_ for events.
-  base::ObjectWatcher watcher_;
+  base::win::ObjectWatcher watcher_;
 
   // Keep track of the last modified time of the file.  We use nulltime
   // to represent the file not existing.
diff --git a/chrome/browser/first_run/first_run_win.cc b/chrome/browser/first_run/first_run_win.cc
index 995dcb2..088ee5a 100644
--- a/chrome/browser/first_run/first_run_win.cc
+++ b/chrome/browser/first_run/first_run_win.cc
@@ -16,13 +16,13 @@
 #include "app/resource_bundle.h"
 #include "base/environment.h"
 #include "base/file_util.h"
-#include "base/object_watcher.h"
 #include "base/path_service.h"
 #include "base/scoped_comptr_win.h"
 #include "base/scoped_ptr.h"
 #include "base/string_number_conversions.h"
 #include "base/string_split.h"
 #include "base/utf_string_conversions.h"
+#include "base/win/object_watcher.h"
 #include "base/win/registry.h"
 #include "base/win/windows_version.h"
 #include "chrome/browser/extensions/extension_service.h"
@@ -321,7 +321,7 @@ namespace {
 // process has ended and what was the result of the operation as reported by
 // the process exit code. This class executes in the context of the main chrome
 // process.
-class ImportProcessRunner : public base::ObjectWatcher::Delegate {
+class ImportProcessRunner : public base::win::ObjectWatcher::Delegate {
  public:
   // The constructor takes the importer process to watch and then it does a
   // message loop blocking wait until the process ends. This object now owns
@@ -350,7 +350,7 @@ class ImportProcessRunner : public base::ObjectWatcher::Delegate {
   }
 
  private:
-  base::ObjectWatcher watcher_;
+  base::win::ObjectWatcher watcher_;
   base::ProcessHandle import_process_;
   DWORD exit_code_;
 };
diff --git a/chrome/browser/policy/configuration_policy_loader_win.h b/chrome/browser/policy/configuration_policy_loader_win.h
index a898afc..65319fe 100644
--- a/chrome/browser/policy/configuration_policy_loader_win.h
+++ b/chrome/browser/policy/configuration_policy_loader_win.h
@@ -6,8 +6,8 @@
 #define CHROME_BROWSER_POLICY_CONFIGURATION_POLICY_LOADER_WIN_H_
 #pragma once
 
-#include "base/object_watcher.h"
 #include "base/waitable_event.h"
+#include "base/win/object_watcher.h"
 #include "chrome/browser/policy/asynchronous_policy_loader.h"
 
 namespace policy {
@@ -16,7 +16,7 @@ namespace policy {
 // reload when Group Policy changes.
 class ConfigurationPolicyLoaderWin
     : public AsynchronousPolicyLoader,
-      public base::ObjectWatcher::Delegate,
+      public base::win::ObjectWatcher::Delegate,
       public MessageLoop::DestructionObserver {
  public:
   ConfigurationPolicyLoaderWin(
@@ -44,8 +44,8 @@ class ConfigurationPolicyLoaderWin
 
   base::WaitableEvent user_policy_changed_event_;
   base::WaitableEvent machine_policy_changed_event_;
-  base::ObjectWatcher user_policy_watcher_;
-  base::ObjectWatcher machine_policy_watcher_;
+  base::win::ObjectWatcher user_policy_watcher_;
+  base::win::ObjectWatcher machine_policy_watcher_;
   bool user_policy_watcher_failed_;
   bool machine_policy_watcher_failed_;
 
diff --git a/chrome/common/process_watcher_win.cc b/chrome/common/process_watcher_win.cc
index 210b3d5..3378960 100644
--- a/chrome/common/process_watcher_win.cc
+++ b/chrome/common/process_watcher_win.cc
@@ -7,7 +7,7 @@
 #include "base/scoped_ptr.h"
 #include "base/environment.h"
 #include "base/message_loop.h"
-#include "base/object_watcher.h"
+#include "base/win/object_watcher.h"
 #include "chrome/common/env_vars.h"
 #include "chrome/common/result_codes.h"
 
@@ -16,7 +16,8 @@ static const int kWaitInterval = 2000;
 
 namespace {
 
-class TimerExpiredTask : public Task, public base::ObjectWatcher::Delegate {
+class TimerExpiredTask : public Task,
+                         public base::win::ObjectWatcher::Delegate {
  public:
   explicit TimerExpiredTask(base::ProcessHandle process) : process_(process) {
     watcher_.StartWatching(process_, this);
@@ -72,7 +73,7 @@ class TimerExpiredTask : public Task, public base::ObjectWatcher::Delegate {
   // The process that we are watching.
   base::ProcessHandle process_;
 
-  base::ObjectWatcher watcher_;
+  base::win::ObjectWatcher watcher_;
 
   DISALLOW_COPY_AND_ASSIGN(TimerExpiredTask);
 };
diff --git a/chrome/common/service_process_util_win.cc b/chrome/common/service_process_util_win.cc
index 3e03285..d30e696 100644
--- a/chrome/common/service_process_util_win.cc
+++ b/chrome/common/service_process_util_win.cc
@@ -7,11 +7,11 @@
 #include "base/command_line.h"
 #include "base/file_util.h"
 #include "base/logging.h"
-#include "base/object_watcher.h"
 #include "base/path_service.h"
 #include "base/scoped_handle_win.h"
 #include "base/string16.h"
 #include "base/utf_string_conversions.h"
+#include "base/win/object_watcher.h"
 #include "base/win/win_util.h"
 #include "chrome/common/chrome_switches.h"
 
@@ -27,7 +27,8 @@ string16 GetServiceProcessShutdownEventName() {
       GetServiceProcessScopedVersionedName("_service_shutdown_evt"));
 }
 
-class ServiceProcessShutdownMonitor : public base::ObjectWatcher::Delegate {
+class ServiceProcessShutdownMonitor
+    : public base::win::ObjectWatcher::Delegate {
  public:
   explicit ServiceProcessShutdownMonitor(Task* shutdown_task)
       : shutdown_task_(shutdown_task) {
@@ -47,7 +48,7 @@ class ServiceProcessShutdownMonitor : public base::ObjectWatcher::Delegate {
 
  private:
   ScopedHandle shutdown_event_;
-  base::ObjectWatcher watcher_;
+  base::win::ObjectWatcher watcher_;
   scoped_ptr<Task> shutdown_task_;
 };
 
diff --git a/chrome/service/cloud_print/print_system_win.cc b/chrome/service/cloud_print/print_system_win.cc
index 8d92e3dfb..d77217f 100644
--- a/chrome/service/cloud_print/print_system_win.cc
+++ b/chrome/service/cloud_print/print_system_win.cc
@@ -8,9 +8,9 @@
 #include <winspool.h>
 
 #include "base/file_path.h"
-#include "base/object_watcher.h"
 #include "base/scoped_ptr.h"
 #include "base/utf_string_conversions.h"
+#include "base/win/object_watcher.h"
 #include "base/win/scoped_bstr.h"
 #include "base/win/scoped_comptr.h"
 #include "base/win/scoped_hdc.h"
@@ -110,8 +110,7 @@ HRESULT PrintTicketToDevMode(const std::string& printer_name,
 
 namespace cloud_print {
 
-class PrintSystemWatcherWin
-    : public base::ObjectWatcher::Delegate {
+class PrintSystemWatcherWin : public base::win::ObjectWatcher::Delegate {
  public:
   PrintSystemWatcherWin()
       : printer_(NULL),
@@ -224,7 +223,7 @@ class PrintSystemWatcherWin
   }
 
  private:
-  base::ObjectWatcher watcher_;
+  base::win::ObjectWatcher watcher_;
   HANDLE printer_;            // The printer being watched
   HANDLE printer_change_;     // Returned by FindFirstPrinterChangeNotifier
   Delegate* delegate_;        // Delegate to notify