Aura: Resize locks with --ui-enable-threaded-compositing

ui/compositor/layer_unittest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/path_service.h"
@@ skipping 305 matching lines @@
     return base::Closure();
   }
 
   DISALLOW_COPY_AND_ASSIGN(NullLayerDelegate);
 };
 
 // Remembers if it has been notified.
 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;
   }
 
  private:
   virtual void OnCompositingDidCommit(Compositor* compositor) OVERRIDE {
   }
 
-  virtual void OnCompositingWillStart(Compositor* compositor) OVERRIDE {
-    will_start_ = true;
-  }
-
   virtual void OnCompositingStarted(Compositor* compositor) OVERRIDE {
     started_ = true;
   }
 
   virtual void OnCompositingEnded(Compositor* compositor) OVERRIDE {
     ended_ = true;
   }
 
   virtual void OnCompositingAborted(Compositor* compositor) OVERRIDE {
     aborted_ = true;
   }
 
-  bool will_start_;
+  virtual void OnCompositingLockStateChanged(Compositor* compositor) OVERRIDE {
+  }
+
   bool started_;
   bool ended_;
   bool aborted_;
 
   DISALLOW_COPY_AND_ASSIGN(TestCompositorObserver);
 };
 
 }  // namespace
 
 #if defined(OS_WIN)
@@ skipping 930 matching lines @@
 
   // Resize layer.
   child->SetBounds(gfx::Rect(200, 200, 400, 400));
   child->SetVisible(true);
   EXPECT_TRUE(schedule_draw_invoked_);
   DrawTree(root.get());
   EXPECT_TRUE(delegate.painted());
 }
 
 }  // namespace ui