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

chrome_frame/test/win_event_receiver.cc

 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome_frame/test/win_event_receiver.h"
 
 #include "base/logging.h"
 #include "base/message_loop.h"
-#include "base/object_watcher.h"
+#include "base/win/object_watcher.h"
 #include "base/string_util.h"
 
 #include "chrome_frame/function_stub.h"
 
 // WinEventReceiver methods
 WinEventReceiver::WinEventReceiver()
     : listener_(NULL),
       hook_(NULL),
       hook_stub_(NULL) {
 }
@@ skipping 51 matching lines @@
 }
 
 // Notifies WindowWatchdog when the process owning a given window exits.
 //
 // If the process terminates before its handle may be obtained, this class will
 // still properly notifyy the WindowWatchdog.
 //
 // Notification is always delivered via a message loop task in the message loop
 // that is active when the instance is constructed.
 class WindowWatchdog::ProcessExitObserver
-    : public base::ObjectWatcher::Delegate {
+    : public base::win::ObjectWatcher::Delegate {
  public:
   // Initiates the process watch. Will always return without notifying the
   // watchdog.
   ProcessExitObserver(WindowWatchdog* window_watchdog, HWND hwnd);
   virtual ~ProcessExitObserver();
 
   // base::ObjectWatcher::Delegate implementation
   virtual void OnObjectSignaled(HANDLE process_handle);
 
  private:
   WindowWatchdog* window_watchdog_;
   HANDLE process_handle_;
   HWND hwnd_;
 
   ScopedRunnableMethodFactory<ProcessExitObserver> method_task_factory_;
-  base::ObjectWatcher object_watcher_;
+  base::win::ObjectWatcher object_watcher_;
 
   DISALLOW_COPY_AND_ASSIGN(ProcessExitObserver);
 };
 
 WindowWatchdog::ProcessExitObserver::ProcessExitObserver(
     WindowWatchdog* window_watchdog, HWND hwnd)
     : window_watchdog_(window_watchdog),
       process_handle_(NULL),
       hwnd_(hwnd),
       ALLOW_THIS_IN_INITIALIZER_LIST(method_task_factory_(this)) {
@@ skipping 158 matching lines @@
     HandleOnOpen(hwnd);
   } else {
     DCHECK(event == EVENT_OBJECT_DESTROY || event == EVENT_OBJECT_HIDE);
     HandleOnClose(hwnd);
   }
 }
 
 void WindowWatchdog::OnHwndProcessExited(HWND hwnd) {
   HandleOnClose(hwnd);
 }