| Index: cc/trees/layer_tree_host_unittest.cc
|
| diff --git a/cc/trees/layer_tree_host_unittest.cc b/cc/trees/layer_tree_host_unittest.cc
|
| index 65b8e2454a8254e9a14021b3cb72d6d40016c70f..89faf4938b1d6c28b3408eae9b6d96d82549eda6 100644
|
| --- a/cc/trees/layer_tree_host_unittest.cc
|
| +++ b/cc/trees/layer_tree_host_unittest.cc
|
| @@ -2317,43 +2317,6 @@ class LayerTreeHostTestBeginFrameNotificationShutdownWhileEnabled
|
| MULTI_THREAD_TEST_F(
|
| LayerTreeHostTestBeginFrameNotificationShutdownWhileEnabled);
|
|
|
| -class LayerTreeHostTestInputDrivenRendering : public LayerTreeHostTest {
|
| - public:
|
| - virtual void InitializeSettings(LayerTreeSettings* settings) OVERRIDE {
|
| - settings->begin_frame_scheduling_enabled = true;
|
| - }
|
| -
|
| - virtual void BeginTest() OVERRIDE {
|
| - frame_time_ = base::TimeTicks::Now();
|
| - PostSetNeedsCommitToMainThread();
|
| - }
|
| -
|
| - virtual void CommitCompleteOnThread(LayerTreeHostImpl* host_impl) OVERRIDE {
|
| - // Post a task to send the final input event for the current BeginFrame;
|
| - // it should trigger rendering.
|
| - ImplThread()->PostTask(
|
| - base::Bind(&LayerTreeHostTestInputDrivenRendering::SendFinalInputEvent,
|
| - base::Unretained(this),
|
| - base::Unretained(host_impl)));
|
| - }
|
| -
|
| - void SendFinalInputEvent(LayerTreeHostImpl* host_impl) {
|
| - host_impl->DidReceiveLastInputEventForBeginFrame(frame_time_);
|
| - }
|
| -
|
| - virtual void DrawLayersOnThread(LayerTreeHostImpl* host_impl) OVERRIDE {
|
| - EXPECT_EQ(frame_time_, **host_impl->fps_counter()->begin());
|
| - EndTest();
|
| - }
|
| -
|
| - virtual void AfterTest() OVERRIDE {}
|
| -
|
| - private:
|
| - base::TimeTicks frame_time_;
|
| -};
|
| -
|
| -MULTI_THREAD_TEST_F(LayerTreeHostTestInputDrivenRendering);
|
| -
|
| class LayerTreeHostTestUninvertibleTransformDoesNotBlockActivation
|
| : public LayerTreeHostTest {
|
| protected:
|
|
|