cc/blimp: Add synchronization for scroll/scale state.

blimp/engine/renderer/frame_scheduler_unittest.cc

 // Copyright 2016 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 <blimp/engine/renderer/frame_scheduler.h>
+#include "blimp/engine/renderer/frame_scheduler.h"
+
 #include "base/run_loop.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace blimp {
 namespace engine {
 namespace {
 
-class FrameSchedulerForTesting : public FrameScheduler {
- public:
-  explicit FrameSchedulerForTesting(FrameSchedulerClient* client)
-      // Use a zero time delta to let tests run main frames back-to-back.
-      : FrameScheduler(base::TimeDelta::FromSeconds(0),
-                       base::ThreadTaskRunnerHandle::Get(),
-                       client) {}
-  ~FrameSchedulerForTesting() override = default;
-};
-
 class FrameSchedulerTest : public testing::Test, public FrameSchedulerClient {
  public:
-  FrameSchedulerTest() : scheduler_(this) {}
+  FrameSchedulerTest() : scheduler_(base::ThreadTaskRunnerHandle::Get(), this) {
+    scheduler_.set_frame_delay_for_testing(base::TimeDelta::FromSeconds(0));
+  }
   ~FrameSchedulerTest() override {}
 
   // FrameSchedulerClient implementation.
   void StartFrameUpdate() override {
     num_frames_++;
     if (send_client_update_during_frame_) {
       scheduler_.DidSendFrameUpdateToClient();
       send_client_update_during_frame_ = false;
     }
   }
 
  protected:
   base::MessageLoop loop_;
-  FrameSchedulerForTesting scheduler_;
+  FrameScheduler scheduler_;
   int num_frames_ = 0;
 
   bool send_client_update_during_frame_ = false;
 };
 
 TEST_F(FrameSchedulerTest, FirstMainFrameRequest) {
   // The request for the first main frame should be responded to right away.
   scheduler_.ScheduleFrameUpdate();
   base::RunLoop().RunUntilIdle();
   EXPECT_EQ(1, num_frames_);
@@ skipping 22 matching lines @@
 
   // Now we have an ack from the client. This should start another frame.
   scheduler_.DidReceiveFrameUpdateAck();
   base::RunLoop().RunUntilIdle();
   EXPECT_EQ(2, num_frames_);
 }
 
 }  // namespace
 }  // namespace engine
 }  // namespace blimp