| Index: ui/compositor/layer_unittest.cc
|
| diff --git a/ui/compositor/layer_unittest.cc b/ui/compositor/layer_unittest.cc
|
| index f246997c8f9853d5dc761e50d51a4333b560d994..7d2a1f66a67038b1e04818eb7ed533f7c29abf0a 100644
|
| --- a/ui/compositor/layer_unittest.cc
|
| +++ b/ui/compositor/layer_unittest.cc
|
| @@ -323,13 +323,12 @@ class NullLayerDelegate : public LayerDelegate {
|
| class TestCompositorObserver : public CompositorObserver {
|
| public:
|
| TestCompositorObserver()
|
| - : will_start_(false), started_(false), ended_(false), aborted_(false) {}
|
| + : started_(false), ended_(false), aborted_(false) {}
|
|
|
| - bool notified() const { return will_start_ && started_ && ended_; }
|
| + bool notified() const { return started_ && ended_; }
|
| bool aborted() const { return aborted_; }
|
|
|
| void Reset() {
|
| - will_start_ = false;
|
| started_ = false;
|
| ended_ = false;
|
| aborted_ = false;
|
| @@ -339,10 +338,6 @@ class TestCompositorObserver : public CompositorObserver {
|
| virtual void OnCompositingDidCommit(Compositor* compositor) OVERRIDE {
|
| }
|
|
|
| - virtual void OnCompositingWillStart(Compositor* compositor) OVERRIDE {
|
| - will_start_ = true;
|
| - }
|
| -
|
| virtual void OnCompositingStarted(Compositor* compositor) OVERRIDE {
|
| started_ = true;
|
| }
|
| @@ -355,7 +350,9 @@ class TestCompositorObserver : public CompositorObserver {
|
| aborted_ = true;
|
| }
|
|
|
| - bool will_start_;
|
| + virtual void OnCompositingLockStateChanged(Compositor* compositor) OVERRIDE {
|
| + }
|
| +
|
| bool started_;
|
| bool ended_;
|
| bool aborted_;
|
|
|