Aura: Make views_unittests work with --ui-enable-threaded-compositing

ui/compositor/compositor.h

Index: ui/compositor/compositor.h
diff --git a/ui/compositor/compositor.h b/ui/compositor/compositor.h
index 7c1d982854af0b5bad28e97eb588a91569d10c2d..a72d229a81c33fda10c32290e9c266a81bbc067d 100644
--- a/ui/compositor/compositor.h
+++ b/ui/compositor/compositor.h
@@ -7,6 +7,7 @@
 
 #include <string>
 
+#include "base/gtest_prod_util.h"
 #include "base/hash_tables.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
@@ -41,6 +42,10 @@ namespace WebKit {
 class WebGraphicsContext3D;
 }
 
+namespace views {
+FORWARD_DECLARE_TEST(ViewLayerTest, DontPaintChildrenWithLayers);
+}
+
 namespace ui {
 
 class Compositor;
@@ -326,6 +331,17 @@ class COMPOSITOR_EXPORT Compositor
   bool IsLocked() { return compositor_lock_ != NULL; }
 
  private:
+  const int kDrawWaitTimeOutMs = 1000;
+  friend class DrawWaiter;

[piman, 2013/04/05 19:28:49]

I don't think DrawWaiter needs intimate knowledge of the compositor.

How about moving DrawWaiter to be more public, and moving the timeout value
there, and then providing maybe a helper static
DrawWaiter::Wait(ui::Compositor*) ?

That way, we don't need the layering violating friend declaration.

If we're worried about misuse outside of tests, we can name it DrawWaiterForTest
(and/or moving it to test infrastructure).

[jonathan.backer, 2013/04/05 20:08:04]

Done.

I think it's much cleaner now. Thanks.

+
+  // Waits at most |kDrawWaitTimeOutMs| milliseconds for a draw to be issued.
+  // If a draw is issued in that timeframe, it will complete. Returns true if
+  // a draw completed, false otherwise.
+  bool WaitForDraw();
+  friend class LayerWithDelegateTest;
+  friend class LayerWithRealCompositorTest;
+  FRIEND_TEST_ALL_PREFIXES(views::ViewLayerTest, DontPaintChildrenWithLayers);
+
   friend class base::RefCounted<Compositor>;
   friend class CompositorLock;