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

base/win/object_watcher_unittest.cc

-// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 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 <process.h>
 
 #include "base/message_loop.h"
-#include "base/object_watcher.h"
+#include "base/win/object_watcher.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
+namespace base {
+namespace win {
+
 namespace {
 
 class QuitDelegate : public base::ObjectWatcher::Delegate {
  public:
   virtual void OnObjectSignaled(HANDLE object) {
     MessageLoop::current()->Quit();
   }
 };
 
 class DecrementCountDelegate : public base::ObjectWatcher::Delegate {
  public:
   explicit DecrementCountDelegate(int* counter) : counter_(counter) {
   }
   virtual void OnObjectSignaled(HANDLE object) {
     --(*counter_);
   }
  private:
   int* counter_;
 };
 
-}  // namespace
-
 void RunTest_BasicSignal(MessageLoop::Type message_loop_type) {
   MessageLoop message_loop(message_loop_type);
 
   base::ObjectWatcher watcher;
   EXPECT_EQ(NULL, watcher.GetWatchedObject());
 
   // A manual-reset event that is not yet signaled.
   HANDLE event = CreateEvent(NULL, TRUE, FALSE, NULL);
 
   QuitDelegate delegate;
@@ skipping 66 matching lines @@
     {
       MessageLoop message_loop(message_loop_type);
 
       QuitDelegate delegate;
       watcher.StartWatching(event, &delegate);
     }
   }
   CloseHandle(event);
 }
 
+}  // namespace
+
 //-----------------------------------------------------------------------------
 
 TEST(ObjectWatcherTest, BasicSignal) {
   RunTest_BasicSignal(MessageLoop::TYPE_DEFAULT);
   RunTest_BasicSignal(MessageLoop::TYPE_IO);
   RunTest_BasicSignal(MessageLoop::TYPE_UI);
 }
 
 TEST(ObjectWatcherTest, BasicCancel) {
   RunTest_BasicCancel(MessageLoop::TYPE_DEFAULT);
   RunTest_BasicCancel(MessageLoop::TYPE_IO);
   RunTest_BasicCancel(MessageLoop::TYPE_UI);
 }
 
 TEST(ObjectWatcherTest, CancelAfterSet) {
   RunTest_CancelAfterSet(MessageLoop::TYPE_DEFAULT);
   RunTest_CancelAfterSet(MessageLoop::TYPE_IO);
   RunTest_CancelAfterSet(MessageLoop::TYPE_UI);
 }
 
 TEST(ObjectWatcherTest, OutlivesMessageLoop) {
   RunTest_OutlivesMessageLoop(MessageLoop::TYPE_DEFAULT);
   RunTest_OutlivesMessageLoop(MessageLoop::TYPE_IO);
   RunTest_OutlivesMessageLoop(MessageLoop::TYPE_UI);
 }
+
+}  // namespace win
+}  // namespace base