commit e588e318bc3410ccdd8c9413ca881b720c6a7373
author Ana Krulec <akrulec@google.com> Tue Sep 18 12:32:24 2018 -0700
committer Ana Krulec <akrulec@google.com> Sat Oct 13 16:44:33 2018 -0700
tree af61edf72e14346adb88e2e5a899db4151e3123c
parent 7ecce8c62d11b6a830bd9c68a71b6f842cac2e7c

Moving DispSync into Scheduler.

This change is part of go/surface-flinger-scheduler.

Test: SF tests pass.
Change-Id: I073a54c2111fa3146af3eb68f3294c3c5c95543c

services/surfaceflinger/tests/unittests/SchedulerTest.cpp

diff --git a/services/surfaceflinger/tests/unittests/SchedulerTest.cpp b/services/surfaceflinger/tests/unittests/SchedulerTest.cpp
index df0d982..be91a9c 100644
--- a/services/surfaceflinger/tests/unittests/SchedulerTest.cpp
+++ b/services/surfaceflinger/tests/unittests/SchedulerTest.cpp
@@ -6,8 +6,11 @@
 
 #include <log/log.h>
 
+#include <mutex>
+
 #include "AsyncCallRecorder.h"
 #include "Scheduler/DispSync.h"
+#include "Scheduler/EventControlThread.h"
 #include "Scheduler/EventThread.h"
 #include "Scheduler/Scheduler.h"
 #include "mock/MockDispSync.h"
@@ -37,7 +40,7 @@
     class MockScheduler : public android::Scheduler {
     public:
         MockScheduler(std::unique_ptr<EventThread> eventThread)
-              : mEventThread(std::move(eventThread)) {}
+              : Scheduler([](bool) {}), mEventThread(std::move(eventThread)) {}
 
         std::unique_ptr<EventThread> makeEventThread(
                 const std::string& /* connectionName */, DispSync* /* dispSync */,
@@ -81,9 +84,9 @@
     EXPECT_CALL(*mEventThread, createEventConnection())
             .WillRepeatedly(Return(mEventThreadConnection));
 
-    mConnectionHandle = mScheduler->createConnection("appConnection", mPrimaryDispSync, 16,
-                                                     mResyncCallRecorder.getInvocable(),
-                                                     mInterceptVSyncCallRecorder.getInvocable());
+    mConnectionHandle =
+            mScheduler->createConnection("appConnection", 16, mResyncCallRecorder.getInvocable(),
+                                         mInterceptVSyncCallRecorder.getInvocable());
 }
 
 SchedulerTest::~SchedulerTest() {