Remove calls to deprecated MessageLoop methods on Windows and Linux.

ui/events/platform/platform_event_source_unittest.cc

 // Copyright 2014 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 "ui/events/platform/platform_event_source.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <memory>
@@ skipping 482 matching lines @@
 }
 
 // Provides mechanism for running tests from inside an active message-loop.
 class PlatformEventTestWithMessageLoop : public PlatformEventTest {
  public:
   PlatformEventTestWithMessageLoop() {}
   ~PlatformEventTestWithMessageLoop() override {}
 
   void Run() {
     message_loop_.task_runner()->PostTask(
-        FROM_HERE, base::Bind(&PlatformEventTestWithMessageLoop::RunTest,
+        FROM_HERE, base::Bind(&PlatformEventTestWithMessageLoop::RunTestImpl,
                               base::Unretained(this)));
-    message_loop_.Run();
+    base::RunLoop().RunUntilIdle();
   }
 
  protected:
-  void RunTest() {
-    RunTestImpl();
-    message_loop_.QuitWhenIdle();
-  }
-
   virtual void RunTestImpl() = 0;
 
  private:
   base::MessageLoopForUI message_loop_;
 
   DISALLOW_COPY_AND_ASSIGN(PlatformEventTestWithMessageLoop);
 };
 
 #define RUN_TEST_IN_MESSAGE_LOOP(name) \
   TEST_F(name, Run) { Run(); }
@@ skipping 100 matching lines @@
     ASSERT_LT(count, events.size());
     events.erase(events.begin(), events.begin() + count);
 
     count = source()->DispatchEventStream(events);
     EXPECT_EQ(1u, count);
     ASSERT_EQ(2u, list->size());
     EXPECT_EQ(15, (*list)[0]);
     EXPECT_EQ(10, (*list)[1]);
     list->clear();
 
-    // Terminate the message-loop.
-    base::MessageLoopForUI::current()->QuitNow();
+    // Terminate the run loop.
+    run_loop_.Quit();
   }
 
   // PlatformEventTestWithMessageLoop:
   void RunTestImpl() override {
     std::vector<int> list;
     TestPlatformEventDispatcher dispatcher(10, &list);
     TestPlatformEventObserver observer(15, &list);
 
     DestroyScopedHandleDispatcher overriding(20, &list);
     source()->RemovePlatformEventDispatcher(&overriding);
     std::unique_ptr<ScopedEventDispatcher> override_handle =
         source()->OverrideDispatcher(&overriding);
 
     std::unique_ptr<PlatformEvent> event(CreatePlatformEvent());
     source()->Dispatch(*event);
     ASSERT_EQ(2u, list.size());
     EXPECT_EQ(15, list[0]);
     EXPECT_EQ(20, list[1]);
     list.clear();
 
     overriding.SetScopedHandle(std::move(override_handle));
-    base::RunLoop run_loop;
     base::MessageLoopForUI* loop = base::MessageLoopForUI::current();
     base::MessageLoopForUI::ScopedNestableTaskAllower allow_nested(loop);
     loop->task_runner()->PostTask(
         FROM_HERE,
         base::Bind(
             &DestroyedNestedOverriddenDispatcherQuitsNestedLoopIteration::
                 NestedTask,
             base::Unretained(this), base::Unretained(&list),
             base::Unretained(&overriding)));
-    run_loop.Run();
+    run_loop_.Run();
 
     // Dispatching the event should now reach the default dispatcher.
     source()->Dispatch(*event);
     ASSERT_EQ(2u, list.size());
     EXPECT_EQ(15, list[0]);
     EXPECT_EQ(10, list[1]);
   }
+
+ private:
+  base::RunLoop run_loop_;
 };
 
 RUN_TEST_IN_MESSAGE_LOOP(
     DestroyedNestedOverriddenDispatcherQuitsNestedLoopIteration)
 
 // Tests that resetting an overridden dispatcher, and installing another
 // overridden dispatcher before the nested message-loop completely unwinds
 // function correctly.
 class ConsecutiveOverriddenDispatcherInTheSameMessageLoopIteration
     : public PlatformEventTestWithMessageLoop {
@@ skipping 38 matching lines @@
         FROM_HERE,
         base::Bind(base::IgnoreResult(&TestPlatformEventSource::Dispatch),
                    base::Unretained(source()), *event));
     run_loop.Run();
     ASSERT_EQ(2u, list->size());
     EXPECT_EQ(15, (*list)[0]);
     EXPECT_EQ(70, (*list)[1]);
     list->clear();
 
     // Terminate the message-loop.
-    base::MessageLoopForUI::current()->QuitNow();
+    run_loop_.Quit();
   }
 
   // PlatformEventTestWithMessageLoop:
   void RunTestImpl() override {
     std::vector<int> list;
     TestPlatformEventDispatcher dispatcher(10, &list);
     TestPlatformEventObserver observer(15, &list);
 
     TestPlatformEventDispatcher overriding(20, &list);
     source()->RemovePlatformEventDispatcher(&overriding);
     std::unique_ptr<ScopedEventDispatcher> override_handle =
         source()->OverrideDispatcher(&overriding);
 
     std::unique_ptr<PlatformEvent> event(CreatePlatformEvent());
     source()->Dispatch(*event);
     ASSERT_EQ(2u, list.size());
     EXPECT_EQ(15, list[0]);
     EXPECT_EQ(20, list[1]);
     list.clear();
 
     // Start a nested message-loop, and destroy |override_handle| in the nested
     // loop. That should terminate the nested loop, restore the previous
     // dispatchers, and return control to this function.
-    base::RunLoop run_loop;
     base::MessageLoopForUI* loop = base::MessageLoopForUI::current();
     base::MessageLoopForUI::ScopedNestableTaskAllower allow_nested(loop);
     loop->task_runner()->PostTask(
         FROM_HERE,
         base::Bind(
             &ConsecutiveOverriddenDispatcherInTheSameMessageLoopIteration::
                 NestedTask,
             base::Unretained(this), base::Passed(&override_handle),
             base::Unretained(&list)));
-    run_loop.Run();
+    run_loop_.Run();
 
     // Dispatching the event should now reach the default dispatcher.
     source()->Dispatch(*event);
     ASSERT_EQ(2u, list.size());
     EXPECT_EQ(15, list[0]);
     EXPECT_EQ(10, list[1]);
   }
+
+ private:
+  base::RunLoop run_loop_;
 };
 
 RUN_TEST_IN_MESSAGE_LOOP(
     ConsecutiveOverriddenDispatcherInTheSameMessageLoopIteration)
 
 }  // namespace ui