Use MessageLoop for CompositorTest.LocksTimeOut

ui/compositor/compositor_unittest.cc

 // Copyright 2015 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/test/test_simple_task_runner.h"
+#include "base/message_loop/message_loop_proxy.h"
+#include "base/run_loop.h"
 #include "cc/output/begin_frame_args.h"
 #include "cc/test/begin_frame_args_test.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/compositor/compositor.h"
 #include "ui/compositor/test/context_factories_for_test.h"
 
 using testing::Mock;
 using testing::_;
 
 namespace ui {
 namespace {
 
 class MockCompositorBeginFrameObserver : public CompositorBeginFrameObserver {
  public:
   MOCK_METHOD1(OnSendBeginFrame, void(const cc::BeginFrameArgs&));
 };
 
 // Test fixture for tests that require a ui::Compositor with a real task
 // runner.
 class CompositorTest : public testing::Test {
  public:
   CompositorTest() {}
   ~CompositorTest() override {}
 
   void SetUp() override {
-    task_runner_ = new base::TestSimpleTaskRunner;
+    task_runner_ = base::MessageLoopProxy::current();

[danakj, 2015/04/21 21:18:28]

This should be ThreadTaskRunnerHandle::Get()

 
     ui::ContextFactory* context_factory =
         ui::InitializeContextFactoryForTests(false);
 
     compositor_.reset(new ui::Compositor(gfx::kNullAcceleratedWidget,
                                          context_factory, task_runner_));
   }
   void TearDown() override {
     compositor_.reset();
     ui::TerminateContextFactoryForTests();
   }
 
  protected:
-  base::TestSimpleTaskRunner* task_runner() { return task_runner_.get(); }
+  base::MessageLoopProxy* task_runner() { return task_runner_.get(); }

[danakj, 2015/04/21 21:18:28]

This should be a SingleThreadTaskRunner, MLP is deprecated.

   ui::Compositor* compositor() { return compositor_.get(); }
 
  private:
-  scoped_refptr<base::TestSimpleTaskRunner> task_runner_;
+  scoped_refptr<base::MessageLoopProxy> task_runner_;

[danakj, 2015/04/21 21:18:28]

This should be SingleThreadTaskRunner too

   scoped_ptr<ui::Compositor> compositor_;
 
   DISALLOW_COPY_AND_ASSIGN(CompositorTest);
 };
 
 }  // namespace
 
 TEST_F(CompositorTest, LocksTimeOut) {
   scoped_refptr<ui::CompositorLock> lock;
+  {
+    base::RunLoop run_loop;
+    // Ensure that the lock times out by default.
+    lock = compositor()->GetCompositorLock();
+    EXPECT_TRUE(compositor()->IsLocked());
+    task_runner()->PostDelayedTask(
+        FROM_HERE, run_loop.QuitClosure(),
+        base::TimeDelta::FromMilliseconds(kCompositorLockTimeoutMs));
+    run_loop.Run();
+    EXPECT_FALSE(compositor()->IsLocked());
+  }
 
-  // Ensure that the lock times out by default.
-  lock = compositor()->GetCompositorLock();
-  EXPECT_TRUE(compositor()->IsLocked());
-  task_runner()->RunUntilIdle();
-  EXPECT_FALSE(compositor()->IsLocked());
-
-  // Ensure that the lock does not time out when set.
-  compositor()->SetLocksWillTimeOut(false);
-  lock = compositor()->GetCompositorLock();
-  EXPECT_TRUE(compositor()->IsLocked());
-  task_runner()->RunUntilIdle();
-  EXPECT_TRUE(compositor()->IsLocked());
+  {
+    base::RunLoop run_loop;
+    // Ensure that the lock does not time out when set.
+    compositor()->SetLocksWillTimeOut(false);
+    lock = compositor()->GetCompositorLock();
+    EXPECT_TRUE(compositor()->IsLocked());
+    task_runner()->PostDelayedTask(
+        FROM_HERE, run_loop.QuitClosure(),
+        base::TimeDelta::FromMilliseconds(kCompositorLockTimeoutMs));
+    run_loop.Run();
+    EXPECT_TRUE(compositor()->IsLocked());
+  }
 }
 
 TEST_F(CompositorTest, AddAndRemoveBeginFrameObserver) {
   cc::BeginFrameArgs args =
     cc::CreateBeginFrameArgsForTesting(BEGINFRAME_FROM_HERE,
                                        base::TimeTicks::FromInternalValue(33));
 
   // Simulate to trigger new BeginFrame by using |args|.
   compositor()->SendBeginFramesToChildren(args);
 
@@ skipping 24 matching lines @@
   EXPECT_CALL(test_observer2, OnSendBeginFrame(_)).Times(0);
   compositor()->RemoveBeginFrameObserver(&test_observer);
   compositor()->RemoveBeginFrameObserver(&test_observer2);
   compositor()->AddBeginFrameObserver(&test_observer2);
   Mock::VerifyAndClearExpectations(&test_observer2);
 
   compositor()->RemoveBeginFrameObserver(&test_observer2);
 }
 
 }  // namespace ui