| Index: cc/scheduler/frame_rate_controller_unittest.cc
|
| diff --git a/cc/scheduler/frame_rate_controller_unittest.cc b/cc/scheduler/frame_rate_controller_unittest.cc
|
| index 183f5763aaf3f37a5fca2d2a973d6827fc41fe37..3fcf4a73aa0722866ba18302982a02b27ee77d58 100644
|
| --- a/cc/scheduler/frame_rate_controller_unittest.cc
|
| +++ b/cc/scheduler/frame_rate_controller_unittest.cc
|
| @@ -17,7 +17,7 @@ class FakeFrameRateControllerClient : public cc::FrameRateControllerClient {
|
| void Reset() { began_frame_ = false; }
|
| bool BeganFrame() const { return began_frame_; }
|
|
|
| - virtual void BeginFrame(bool throttled) OVERRIDE {
|
| + virtual void FrameRateControllerTick(bool throttled) OVERRIDE {
|
| began_frame_ = !throttled;
|
| }
|
|
|
| @@ -74,7 +74,7 @@ TEST(FrameRateControllerTest, TestFrameThrottling_TwoFramesInFlight) {
|
|
|
| controller.SetClient(&client);
|
| controller.SetActive(true);
|
| - controller.SetMaxFramesPending(2);
|
| + controller.SetMaxSwapsPending(2);
|
|
|
| base::TimeTicks elapsed; // Muck around with time a bit
|
|
|
| @@ -132,7 +132,7 @@ TEST(FrameRateControllerTest, TestFrameThrottling_Unthrottled) {
|
| FrameRateController controller(&thread);
|
|
|
| controller.SetClient(&client);
|
| - controller.SetMaxFramesPending(2);
|
| + controller.SetMaxSwapsPending(2);
|
|
|
| // SetActive triggers 1st frame, make sure the BeginFrame callback
|
| // is called
|
|
|