| Index: ui/compositor/layer_unittest.cc
|
| ===================================================================
|
| --- ui/compositor/layer_unittest.cc (revision 139956)
|
| +++ ui/compositor/layer_unittest.cc (working copy)
|
| @@ -309,15 +309,13 @@
|
| // Remembers if it has been notified.
|
| class TestCompositorObserver : public CompositorObserver {
|
| public:
|
| - TestCompositorObserver() : started_(false), ended_(false), aborted_(false) {}
|
| + TestCompositorObserver() : started_(false), ended_(false) {}
|
|
|
| bool notified() const { return started_ && ended_; }
|
| - bool aborted() const { return aborted_; }
|
|
|
| void Reset() {
|
| started_ = false;
|
| ended_ = false;
|
| - aborted_ = false;
|
| }
|
|
|
| private:
|
| @@ -329,13 +327,8 @@
|
| ended_ = true;
|
| }
|
|
|
| - virtual void OnCompositingAborted(Compositor* compositor) OVERRIDE {
|
| - aborted_ = true;
|
| - }
|
| -
|
| bool started_;
|
| bool ended_;
|
| - bool aborted_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(TestCompositorObserver);
|
| };
|
| @@ -893,15 +886,6 @@
|
| RunPendingMessages();
|
| EXPECT_TRUE(observer.notified());
|
|
|
| - // A change resulting in an aborted swap buffer should alert the observer
|
| - // and also signal an abort.
|
| - observer.Reset();
|
| - l2->SetOpacity(0.1f);
|
| - GetCompositor()->OnSwapBuffersAborted();
|
| - RunPendingMessages();
|
| - EXPECT_TRUE(observer.notified());
|
| - EXPECT_TRUE(observer.aborted());
|
| -
|
| GetCompositor()->RemoveObserver(&observer);
|
|
|
| // Opacity changes should no longer alert the removed observer.
|
|
|