Remove calls to deprecated MessageLoop methods on Windows and Linux.

base/win/object_watcher_unittest.cc

 // 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 "base/win/object_watcher.h"
 
 #include <process.h>
 
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
@@ skipping 31 matching lines @@
   HANDLE event = CreateEvent(NULL, TRUE, FALSE, NULL);
 
   QuitDelegate delegate;
   bool ok = watcher.StartWatchingOnce(event, &delegate);
   EXPECT_TRUE(ok);
   EXPECT_TRUE(watcher.IsWatching());
   EXPECT_EQ(event, watcher.GetWatchedObject());
 
   SetEvent(event);
 
-  MessageLoop::current()->Run();
+  RunLoop().Run();
 
   EXPECT_FALSE(watcher.IsWatching());
   CloseHandle(event);
 }
 
 void RunTest_BasicCancel(MessageLoop::Type message_loop_type) {
   MessageLoop message_loop(message_loop_type);
 
   ObjectWatcher watcher;
 
@@ skipping 43 matching lines @@
 
   ObjectWatcher watcher;
 
   // A manual-reset event that is signaled before we begin watching.
   HANDLE event = CreateEvent(NULL, TRUE, TRUE, NULL);
 
   QuitDelegate delegate;
   bool ok = watcher.StartWatchingOnce(event, &delegate);
   EXPECT_TRUE(ok);
 
-  MessageLoop::current()->Run();
+  RunLoop().Run();
 
   EXPECT_FALSE(watcher.IsWatching());
   CloseHandle(event);
 }
 
 void RunTest_OutlivesMessageLoop(MessageLoop::Type message_loop_type) {
   // Simulate a MessageLoop that dies before an ObjectWatcher.  This ordinarily
   // doesn't happen when people use the Thread class, but it can happen when
   // people use the Singleton pattern or atexit.
   HANDLE event = CreateEvent(NULL, TRUE, FALSE, NULL);  // not signaled
@@ skipping 36 matching lines @@
   HANDLE event = CreateEvent(NULL, FALSE, FALSE, NULL);
 
   QuitAfterMultipleDelegate delegate(event, 2);
   bool ok = watcher.StartWatchingMultipleTimes(event, &delegate);
   EXPECT_TRUE(ok);
   EXPECT_TRUE(watcher.IsWatching());
   EXPECT_EQ(event, watcher.GetWatchedObject());
 
   SetEvent(event);
 
-  MessageLoop::current()->Run();
+  RunLoop().Run();
 
   EXPECT_TRUE(watcher.IsWatching());
   EXPECT_TRUE(watcher.StopWatching());
   CloseHandle(event);
 }
 
 }  // namespace
 
 //-----------------------------------------------------------------------------
 
@@ skipping 28 matching lines @@
 }
 
 TEST(ObjectWatcherTest, ExecuteMultipleTimes) {
   RunTest_ExecuteMultipleTimes(MessageLoop::TYPE_DEFAULT);
   RunTest_ExecuteMultipleTimes(MessageLoop::TYPE_IO);
   RunTest_ExecuteMultipleTimes(MessageLoop::TYPE_UI);
 }
 
 }  // namespace win
 }  // namespace base