| 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 b194491d7606763193f75e034c965c5b022ebeb7..01aae1488bd948e1a41cd4e58729bd7b9b1d12a4 100644
|
| --- a/cc/trees/layer_tree_host_unittest.cc
|
| +++ b/cc/trees/layer_tree_host_unittest.cc
|
| @@ -4432,6 +4432,8 @@ class TestSwapPromise : public SwapPromise {
|
| result_->reason = reason;
|
| }
|
|
|
| + virtual int64 TraceId() const OVERRIDE { return 0; }
|
| +
|
| private:
|
| // Not owned.
|
| TestSwapPromiseResult* result_;
|
| @@ -4517,8 +4519,7 @@ class SimpleSwapPromiseMonitor : public SwapPromiseMonitor {
|
| int* set_needs_commit_count,
|
| int* set_needs_redraw_count)
|
| : SwapPromiseMonitor(layer_tree_host, layer_tree_host_impl),
|
| - set_needs_commit_count_(set_needs_commit_count),
|
| - set_needs_redraw_count_(set_needs_redraw_count) {}
|
| + set_needs_commit_count_(set_needs_commit_count) {}
|
|
|
| virtual ~SimpleSwapPromiseMonitor() {}
|
|
|
| @@ -4527,12 +4528,15 @@ class SimpleSwapPromiseMonitor : public SwapPromiseMonitor {
|
| }
|
|
|
| virtual void OnSetNeedsRedrawOnImpl() OVERRIDE {
|
| - (*set_needs_redraw_count_)++;
|
| + ADD_FAILURE() << "Should not get called on main thread.";
|
| + }
|
| +
|
| + virtual void OnForwardScrollUpdateToMainThreadOnImpl() OVERRIDE {
|
| + ADD_FAILURE() << "Should not get called on main thread.";
|
| }
|
|
|
| private:
|
| int* set_needs_commit_count_;
|
| - int* set_needs_redraw_count_;
|
| };
|
|
|
| class LayerTreeHostTestSimpleSwapPromiseMonitor : public LayerTreeHostTest {
|
|
|