Fix CompositorResizeLock to do something.

ui/compositor/compositor_unittest.cc

Index: ui/compositor/compositor_unittest.cc
diff --git a/ui/compositor/compositor_unittest.cc b/ui/compositor/compositor_unittest.cc
index e62e0b8c430a84131a25aeb4a6c3ee619a3eab11..a5e9ca2655cdf7dd086030c1aa59a1da8e582f7b 100644
--- a/ui/compositor/compositor_unittest.cc
+++ b/ui/compositor/compositor_unittest.cc
@@ -62,31 +62,39 @@ class CompositorTest : public testing::Test {
   DISALLOW_COPY_AND_ASSIGN(CompositorTest);
 };
 
+class MockCompositorLockClient
+    : NON_EXPORTED_BASE(public ui::CompositorLockClient) {
+ public:
+  MOCK_METHOD0(CompositorLockTimedOut, void());
+};
+
 }  // namespace
 
 TEST_F(CompositorTest, LocksTimeOut) {
   scoped_refptr<ui::CompositorLock> lock;
+
+  base::TimeDelta timeout = base::TimeDelta::FromMilliseconds(100);
+
   {
+    testing::StrictMock<MockCompositorLockClient> lock_client;
     base::RunLoop run_loop;
-    // Ensure that the lock times out by default.
-    lock = compositor()->GetCompositorLock();
+    // This lock has a timeout.
+    lock = compositor()->GetCompositorLock(&lock_client, timeout);
     EXPECT_TRUE(compositor()->IsLocked());
-    task_runner()->PostDelayedTask(
-        FROM_HERE, run_loop.QuitClosure(),
-        base::TimeDelta::FromMilliseconds(kCompositorLockTimeoutMs));
+    task_runner()->PostDelayedTask(FROM_HERE, run_loop.QuitClosure(), timeout);
+    EXPECT_CALL(lock_client, CompositorLockTimedOut()).Times(1);
     run_loop.Run();
     EXPECT_FALSE(compositor()->IsLocked());
   }
 
   {
+    testing::StrictMock<MockCompositorLockClient> lock_client;
     base::RunLoop run_loop;
-    // Ensure that the lock does not time out when set.
-    compositor()->SetLocksWillTimeOut(false);
-    lock = compositor()->GetCompositorLock();
+    // This lock has no timeout.
+    lock = compositor()->GetCompositorLock(&lock_client, base::TimeDelta());
     EXPECT_TRUE(compositor()->IsLocked());
-    task_runner()->PostDelayedTask(
-        FROM_HERE, run_loop.QuitClosure(),
-        base::TimeDelta::FromMilliseconds(kCompositorLockTimeoutMs));
+    task_runner()->PostDelayedTask(FROM_HERE, run_loop.QuitClosure(), timeout);
+    EXPECT_CALL(lock_client, CompositorLockTimedOut()).Times(0);
     run_loop.Run();
     EXPECT_TRUE(compositor()->IsLocked());
   }