Windows scons fix: more functions static and scons file fix

base/waitable_event_watcher_unittest.cc

 // 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.
 
 #include "base/message_loop.h"
 #include "base/platform_thread.h"
 #include "base/waitable_event.h"
 #include "base/waitable_event_watcher.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
@@ skipping 13 matching lines @@
  public:
   DecrementCountDelegate(int* counter) : counter_(counter) {
   }
   virtual void OnWaitableEventSignaled(WaitableEvent* object) {
     --(*counter_);
   }
  private:
   int* counter_;
 };
 
-}  // namespace
-
 void RunTest_BasicSignal(MessageLoop::Type message_loop_type) {
   MessageLoop message_loop(message_loop_type);
 
   // A manual-reset event that is not yet signaled.
   WaitableEvent event(true, false);
 
   WaitableEventWatcher watcher;
   EXPECT_EQ(NULL, watcher.GetWatchedEvent());
 
   QuitDelegate delegate;
@@ skipping 56 matching lines @@
     WaitableEventWatcher watcher;
     {
       MessageLoop message_loop(message_loop_type);
 
       QuitDelegate delegate;
       watcher.StartWatching(&event, &delegate);
     }
   }
 }
 
+}  // namespace
+
 //-----------------------------------------------------------------------------
 
 TEST(WaitableEventWatcherTest, BasicSignal) {
   RunTest_BasicSignal(MessageLoop::TYPE_DEFAULT);
   RunTest_BasicSignal(MessageLoop::TYPE_IO);
   RunTest_BasicSignal(MessageLoop::TYPE_UI);
 }
 
 TEST(WaitableEventWatcherTest, BasicCancel) {
   RunTest_BasicCancel(MessageLoop::TYPE_DEFAULT);
   RunTest_BasicCancel(MessageLoop::TYPE_IO);
   RunTest_BasicCancel(MessageLoop::TYPE_UI);
 }
 
 TEST(WaitableEventWatcherTest, CancelAfterSet) {
   RunTest_CancelAfterSet(MessageLoop::TYPE_DEFAULT);
   RunTest_CancelAfterSet(MessageLoop::TYPE_IO);
   RunTest_CancelAfterSet(MessageLoop::TYPE_UI);
 }
 
 TEST(WaitableEventWatcherTest, OutlivesMessageLoop) {
   RunTest_OutlivesMessageLoop(MessageLoop::TYPE_DEFAULT);
   RunTest_OutlivesMessageLoop(MessageLoop::TYPE_IO);
   RunTest_OutlivesMessageLoop(MessageLoop::TYPE_UI);
 }