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

base/win/object_watcher_unittest.cc

Index: base/win/object_watcher_unittest.cc
===================================================================
--- base/win/object_watcher_unittest.cc	(revision 70358)
+++ base/win/object_watcher_unittest.cc	(working copy)
@@ -1,13 +1,16 @@
-// 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 {
@@ -28,8 +31,6 @@
   int* counter_;
 };
 
-}  // namespace
-
 void RunTest_BasicSignal(MessageLoop::Type message_loop_type) {
   MessageLoop message_loop(message_loop_type);
 
@@ -116,6 +117,8 @@
   CloseHandle(event);
 }
 
+}  // namespace
+
 //-----------------------------------------------------------------------------
 
 TEST(ObjectWatcherTest, BasicSignal) {
@@ -141,3 +144,6 @@
   RunTest_OutlivesMessageLoop(MessageLoop::TYPE_IO);
   RunTest_OutlivesMessageLoop(MessageLoop::TYPE_UI);
 }
+
+}  // namespace win
+}  // namespace base