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

base/waitable_event_watcher.h

 // Copyright (c) 2006-2008 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 BASE_WAITABLE_EVENT_WATCHER_H_
 #define BASE_WAITABLE_EVENT_WATCHER_H_
 #pragma once
 
 #include "build/build_config.h"
 
 #if defined(OS_WIN)
-#include "base/object_watcher.h"
+#include "base/win/object_watcher.h"
 #else
 #include "base/message_loop.h"
 #include "base/waitable_event.h"
 #endif
 
 namespace base {
 
 class Flag;
 class AsyncWaiter;
 class AsyncCallbackTask;
@@ skipping 94 matching lines @@
  private:
   WaitableEvent* event_;
 
 #if defined(OS_WIN)
   // ---------------------------------------------------------------------------
   // The helper class exists because, if WaitableEventWatcher were to inherit
   // from ObjectWatcher::Delegate, then it couldn't also have an inner class
   // called Delegate (at least on Windows). Thus this object exists to proxy
   // the callback function
   // ---------------------------------------------------------------------------
-  class ObjectWatcherHelper : public ObjectWatcher::Delegate {
+  class ObjectWatcherHelper : public win::ObjectWatcher::Delegate {
    public:
     ObjectWatcherHelper(WaitableEventWatcher* watcher);
 
     // -------------------------------------------------------------------------
     // Implementation of ObjectWatcher::Delegate
     // -------------------------------------------------------------------------
     void OnObjectSignaled(HANDLE h);
 
    private:
     WaitableEventWatcher *const watcher_;
   };
 
   void OnObjectSignaled();
 
   ObjectWatcherHelper helper_;
-  ObjectWatcher watcher_;
+  win::ObjectWatcher watcher_;
 #else
   // ---------------------------------------------------------------------------
   // Implementation of MessageLoop::DestructionObserver
   // ---------------------------------------------------------------------------
   virtual void WillDestroyCurrentMessageLoop();
 
   MessageLoop* message_loop_;
   scoped_refptr<Flag> cancel_flag_;
   AsyncWaiter* waiter_;
   AsyncCallbackTask* callback_task_;
   scoped_refptr<WaitableEvent::WaitableEventKernel> kernel_;
 #endif
 
   Delegate* delegate_;
 };
 
 }  // namespace base
 
 #endif  // BASE_WAITABLE_EVENT_WATCHER_H_