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

chrome_frame/test/win_event_receiver.h

 // 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.
 
 #ifndef CHROME_FRAME_TEST_WIN_EVENT_RECEIVER_H_
 #define CHROME_FRAME_TEST_WIN_EVENT_RECEIVER_H_
 
 #include <windows.h>
 
 #include <string>
 #include <vector>
 #include <utility>
 
 #include "base/linked_ptr.h"
-#include "base/object_watcher.h"
+#include "base/win/object_watcher.h"
 
 struct FunctionStub;
 
 // Listens to WinEvents from the WinEventReceiver.
 class WinEventListener {
  public:
   virtual ~WinEventListener() {}
   // Called when an event has been received. |hwnd| is the window that generated
   // the event, or null if no window is associated with the event.
   virtual void OnEventReceived(DWORD event, HWND hwnd, LONG object_id,
@@ skipping 73 matching lines @@
   // Remove all registrations of |observer|. The |observer| will not be notified
   // during or after this call.
   void RemoveObserver(WindowObserver* observer);
 
  private:
   class ProcessExitObserver;
 
   // The Delegate object is actually a ProcessExitObserver, but declaring
   // it as such would require fully declaring the ProcessExitObserver class
   // here in order for linked_ptr to access its destructor.
-  typedef std::pair<HWND, linked_ptr<base::ObjectWatcher::Delegate> >
-    OpenWindowEntry;
+  typedef std::pair<HWND, linked_ptr<base::win::ObjectWatcher::Delegate> >
+      OpenWindowEntry;
   typedef std::vector<OpenWindowEntry> OpenWindowList;
 
   struct ObserverEntry {
     WindowObserver* observer;
     std::string caption_pattern;
     std::string class_name_pattern;
     OpenWindowList open_windows;
   };
 
   typedef std::vector<ObserverEntry> ObserverEntryList;
 
   // WinEventListener implementation.
   virtual void OnEventReceived(
-    DWORD event, HWND hwnd, LONG object_id, LONG child_id);
+      DWORD event, HWND hwnd, LONG object_id, LONG child_id);
 
   static std::string GetWindowCaption(HWND hwnd);
 
   void HandleOnOpen(HWND hwnd);
   void HandleOnClose(HWND hwnd);
   void OnHwndProcessExited(HWND hwnd);
 
   // Returns true if the caption pattern and/or the class name pattern in the
   // observer entry structure matches the caption and/or class name passed in.
   bool MatchingWindow(const ObserverEntry& entry,
                       const std::string& caption,
                       const std::string& class_name);
 
   ObserverEntryList observers_;
   WinEventReceiver win_event_receiver_;
 
   DISALLOW_COPY_AND_ASSIGN(WindowWatchdog);
 };
 
 
 
 #endif  // CHROME_FRAME_TEST_WIN_EVENT_RECEIVER_H_