Revert of Make SingleThreadProxy a SchedulerClient

ui/views/view_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 <map>
 
 #include "base/memory/scoped_ptr.h"
 #include "base/rand_util.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 3383 matching lines @@
   DISALLOW_COPY_AND_ASSIGN(PaintTrackingView);
 };
 
 // Makes sure child views with layers aren't painted when paint starts at an
 // ancestor.
 TEST_F(ViewLayerTest, DontPaintChildrenWithLayers) {
   PaintTrackingView* content_view = new PaintTrackingView;
   widget()->SetContentsView(content_view);
   content_view->SetPaintToLayer(true);
   GetRootLayer()->GetCompositor()->ScheduleDraw();
-  ui::DrawWaiterForTest::WaitForCompositingEnded(
-      GetRootLayer()->GetCompositor());
+  ui::DrawWaiterForTest::Wait(GetRootLayer()->GetCompositor());
   GetRootLayer()->SchedulePaint(gfx::Rect(0, 0, 10, 10));
   content_view->set_painted(false);
   // content_view no longer has a dirty rect. Paint from the root and make sure
   // PaintTrackingView isn't painted.
   GetRootLayer()->GetCompositor()->ScheduleDraw();
-  ui::DrawWaiterForTest::WaitForCompositingEnded(
-      GetRootLayer()->GetCompositor());
+  ui::DrawWaiterForTest::Wait(GetRootLayer()->GetCompositor());
   EXPECT_FALSE(content_view->painted());
 
   // Make content_view have a dirty rect, paint the layers and make sure
   // PaintTrackingView is painted.
   content_view->layer()->SchedulePaint(gfx::Rect(0, 0, 10, 10));
   GetRootLayer()->GetCompositor()->ScheduleDraw();
-  ui::DrawWaiterForTest::WaitForCompositingEnded(
-      GetRootLayer()->GetCompositor());
+  ui::DrawWaiterForTest::Wait(GetRootLayer()->GetCompositor());
   EXPECT_TRUE(content_view->painted());
 }
 
 // Tests that the visibility of child layers are updated correctly when a View's
 // visibility changes.
 TEST_F(ViewLayerTest, VisibilityChildLayers) {
   View* v1 = new View;
   v1->SetPaintToLayer(true);
   widget()->SetContentsView(v1);
 
@@ skipping 219 matching lines @@
   v1->SetBoundsRect(gfx::Rect(10, 15, 150, 151));
   test_view->AddChildView(v1);
 
   View* v2 = new View();
   v2->SetBoundsRect(gfx::Rect(20, 33, 40, 50));
   v1->AddChildView(v2);
 
   // Schedule a full-view paint to get everyone's rectangles updated.
   test_view->SchedulePaintInRect(test_view->bounds());
   GetRootLayer()->GetCompositor()->ScheduleDraw();
-  ui::DrawWaiterForTest::WaitForCompositingEnded(
-      GetRootLayer()->GetCompositor());
+  ui::DrawWaiterForTest::Wait(GetRootLayer()->GetCompositor());
 
   // Now we have test_view - v1 - v2. Damage to only test_view should only
   // return root_view and test_view.
   test_view->SchedulePaintInRect(gfx::Rect(0, 0, 1, 1));
   GetRootLayer()->GetCompositor()->ScheduleDraw();
-  ui::DrawWaiterForTest::WaitForCompositingEnded(
-      GetRootLayer()->GetCompositor());
+  ui::DrawWaiterForTest::Wait(GetRootLayer()->GetCompositor());
   EXPECT_EQ(2U, test_view->last_cull_set_.size());
   EXPECT_EQ(1U, test_view->last_cull_set_.count(widget()->GetRootView()));
   EXPECT_EQ(1U, test_view->last_cull_set_.count(test_view));
 
   // Damage to v1 only should only return root_view, test_view, and v1.
   test_view->SchedulePaintInRect(gfx::Rect(11, 16, 1, 1));
   GetRootLayer()->GetCompositor()->ScheduleDraw();
-  ui::DrawWaiterForTest::WaitForCompositingEnded(
-      GetRootLayer()->GetCompositor());
+  ui::DrawWaiterForTest::Wait(GetRootLayer()->GetCompositor());
   EXPECT_EQ(3U, test_view->last_cull_set_.size());
   EXPECT_EQ(1U, test_view->last_cull_set_.count(widget()->GetRootView()));
   EXPECT_EQ(1U, test_view->last_cull_set_.count(test_view));
   EXPECT_EQ(1U, test_view->last_cull_set_.count(v1));
 
   // A Damage rect inside v2 should get all 3 views back in the |last_cull_set_|
   // on call to TestView::Paint(), along with the widget root view.
   test_view->SchedulePaintInRect(gfx::Rect(31, 49, 1, 1));
   GetRootLayer()->GetCompositor()->ScheduleDraw();
-  ui::DrawWaiterForTest::WaitForCompositingEnded(
-      GetRootLayer()->GetCompositor());
+  ui::DrawWaiterForTest::Wait(GetRootLayer()->GetCompositor());
   EXPECT_EQ(4U, test_view->last_cull_set_.size());
   EXPECT_EQ(1U, test_view->last_cull_set_.count(widget()->GetRootView()));
   EXPECT_EQ(1U, test_view->last_cull_set_.count(test_view));
   EXPECT_EQ(1U, test_view->last_cull_set_.count(v1));
   EXPECT_EQ(1U, test_view->last_cull_set_.count(v2));
 }
 
 TEST_F(ViewLayerTest, BoundsTreeWithRTL) {
   std::string locale = l10n_util::GetApplicationLocale(std::string());
   base::i18n::SetICUDefaultLocale("ar");
 
   BoundsTreeTestView* test_view = new BoundsTreeTestView;
   widget()->SetContentsView(test_view);
 
   // Add child views, which should be in RTL coordinate space of parent view.
   View* v1 = new View;
   v1->SetBoundsRect(gfx::Rect(10, 12, 25, 26));
   test_view->AddChildView(v1);
 
   View* v2 = new View;
   v2->SetBoundsRect(gfx::Rect(5, 6, 7, 8));
   v1->AddChildView(v2);
 
   // Schedule a full-view paint to get everyone's rectangles updated.
   test_view->SchedulePaintInRect(test_view->bounds());
   GetRootLayer()->GetCompositor()->ScheduleDraw();
-  ui::DrawWaiterForTest::WaitForCompositingEnded(
-      GetRootLayer()->GetCompositor());
+  ui::DrawWaiterForTest::Wait(GetRootLayer()->GetCompositor());
 
   // Damage to the right side of the parent view should touch both child views.
   gfx::Rect rtl_damage(test_view->bounds().width() - 16, 18, 1, 1);
   test_view->SchedulePaintInRect(rtl_damage);
   GetRootLayer()->GetCompositor()->ScheduleDraw();
-  ui::DrawWaiterForTest::WaitForCompositingEnded(
-      GetRootLayer()->GetCompositor());
+  ui::DrawWaiterForTest::Wait(GetRootLayer()->GetCompositor());
   EXPECT_EQ(4U, test_view->last_cull_set_.size());
   EXPECT_EQ(1U, test_view->last_cull_set_.count(widget()->GetRootView()));
   EXPECT_EQ(1U, test_view->last_cull_set_.count(test_view));
   EXPECT_EQ(1U, test_view->last_cull_set_.count(v1));
   EXPECT_EQ(1U, test_view->last_cull_set_.count(v2));
 
   // Damage to the left side of the parent view should only touch the
   // container views.
   gfx::Rect ltr_damage(16, 18, 1, 1);
   test_view->SchedulePaintInRect(ltr_damage);
   GetRootLayer()->GetCompositor()->ScheduleDraw();
-  ui::DrawWaiterForTest::WaitForCompositingEnded(
-      GetRootLayer()->GetCompositor());
+  ui::DrawWaiterForTest::Wait(GetRootLayer()->GetCompositor());
   EXPECT_EQ(2U, test_view->last_cull_set_.size());
   EXPECT_EQ(1U, test_view->last_cull_set_.count(widget()->GetRootView()));
   EXPECT_EQ(1U, test_view->last_cull_set_.count(test_view));
 
   // Reset locale.
   base::i18n::SetICUDefaultLocale(locale);
 }
 
 TEST_F(ViewLayerTest, BoundsTreeSetBoundsChangesCullSet) {
   BoundsTreeTestView* test_view = new BoundsTreeTestView;
   widget()->SetContentsView(test_view);
 
   View* v1 = new View;
   v1->SetBoundsRect(gfx::Rect(5, 6, 100, 101));
   test_view->AddChildView(v1);
 
   View* v2 = new View;
   v2->SetBoundsRect(gfx::Rect(20, 33, 40, 50));
   v1->AddChildView(v2);
 
   // Schedule a full-view paint to get everyone's rectangles updated.
   test_view->SchedulePaintInRect(test_view->bounds());
   GetRootLayer()->GetCompositor()->ScheduleDraw();
-  ui::DrawWaiterForTest::WaitForCompositingEnded(
-      GetRootLayer()->GetCompositor());
+  ui::DrawWaiterForTest::Wait(GetRootLayer()->GetCompositor());
 
   // Move v1 to a new origin out of the way of our next query.
   v1->SetBoundsRect(gfx::Rect(50, 60, 100, 101));
   // The move will force a repaint.
   GetRootLayer()->GetCompositor()->ScheduleDraw();
-  ui::DrawWaiterForTest::WaitForCompositingEnded(
-      GetRootLayer()->GetCompositor());
+  ui::DrawWaiterForTest::Wait(GetRootLayer()->GetCompositor());
 
   // Schedule a paint with damage rect where v1 used to be.
   test_view->SchedulePaintInRect(gfx::Rect(5, 6, 10, 11));
   GetRootLayer()->GetCompositor()->ScheduleDraw();
-  ui::DrawWaiterForTest::WaitForCompositingEnded(
-      GetRootLayer()->GetCompositor());
+  ui::DrawWaiterForTest::Wait(GetRootLayer()->GetCompositor());
 
   // Should only have picked up root_view and test_view.
   EXPECT_EQ(2U, test_view->last_cull_set_.size());
   EXPECT_EQ(1U, test_view->last_cull_set_.count(widget()->GetRootView()));
   EXPECT_EQ(1U, test_view->last_cull_set_.count(test_view));
 }
 
 TEST_F(ViewLayerTest, BoundsTreeLayerChangeMakesNewTree) {
   BoundsTreeTestView* test_view = new BoundsTreeTestView;
   widget()->SetContentsView(test_view);
 
   View* v1 = new View;
   v1->SetBoundsRect(gfx::Rect(5, 10, 15, 20));
   test_view->AddChildView(v1);
 
   View* v2 = new View;
   v2->SetBoundsRect(gfx::Rect(1, 2, 3, 4));
   v1->AddChildView(v2);
 
   // Schedule a full-view paint to get everyone's rectangles updated.
   test_view->SchedulePaintInRect(test_view->bounds());
   GetRootLayer()->GetCompositor()->ScheduleDraw();
-  ui::DrawWaiterForTest::WaitForCompositingEnded(
-      GetRootLayer()->GetCompositor());
+  ui::DrawWaiterForTest::Wait(GetRootLayer()->GetCompositor());
 
   // Set v1 to paint to its own layer, it should remove itself from the
   // test_view heiarchy and no longer intersect with damage rects in that cull
   // set.
   v1->SetPaintToLayer(true);
 
   // Schedule another full-view paint.
   test_view->SchedulePaintInRect(test_view->bounds());
   GetRootLayer()->GetCompositor()->ScheduleDraw();
-  ui::DrawWaiterForTest::WaitForCompositingEnded(
-      GetRootLayer()->GetCompositor());
+  ui::DrawWaiterForTest::Wait(GetRootLayer()->GetCompositor());
   // v1 and v2 should no longer be present in the test_view cull_set.
   EXPECT_EQ(2U, test_view->last_cull_set_.size());
   EXPECT_EQ(0U, test_view->last_cull_set_.count(v1));
   EXPECT_EQ(0U, test_view->last_cull_set_.count(v2));
 
   // Now set v1 back to not painting to a layer.
   v1->SetPaintToLayer(false);
   // Schedule another full-view paint.
   test_view->SchedulePaintInRect(test_view->bounds());
   GetRootLayer()->GetCompositor()->ScheduleDraw();
-  ui::DrawWaiterForTest::WaitForCompositingEnded(
-      GetRootLayer()->GetCompositor());
+  ui::DrawWaiterForTest::Wait(GetRootLayer()->GetCompositor());
   // We should be back to the full cull set including v1 and v2.
   EXPECT_EQ(4U, test_view->last_cull_set_.size());
   EXPECT_EQ(1U, test_view->last_cull_set_.count(widget()->GetRootView()));
   EXPECT_EQ(1U, test_view->last_cull_set_.count(test_view));
   EXPECT_EQ(1U, test_view->last_cull_set_.count(v1));
   EXPECT_EQ(1U, test_view->last_cull_set_.count(v2));
 }
 
 TEST_F(ViewLayerTest, BoundsTreeRemoveChildRemovesBounds) {
   BoundsTreeTestView* test_view = new BoundsTreeTestView;
   widget()->SetContentsView(test_view);
 
   View* v1 = new View;
   v1->SetBoundsRect(gfx::Rect(5, 10, 15, 20));
   test_view->AddChildView(v1);
 
   View* v2 = new View;
   v2->SetBoundsRect(gfx::Rect(1, 2, 3, 4));
   v1->AddChildView(v2);
 
   // Schedule a full-view paint to get everyone's rectangles updated.
   test_view->SchedulePaintInRect(test_view->bounds());
   GetRootLayer()->GetCompositor()->ScheduleDraw();
-  ui::DrawWaiterForTest::WaitForCompositingEnded(
-      GetRootLayer()->GetCompositor());
+  ui::DrawWaiterForTest::Wait(GetRootLayer()->GetCompositor());
 
   // Now remove v1 from the root view.
   test_view->RemoveChildView(v1);
 
   // Schedule another full-view paint.
   test_view->SchedulePaintInRect(test_view->bounds());
   GetRootLayer()->GetCompositor()->ScheduleDraw();
-  ui::DrawWaiterForTest::WaitForCompositingEnded(
-      GetRootLayer()->GetCompositor());
+  ui::DrawWaiterForTest::Wait(GetRootLayer()->GetCompositor());
   // v1 and v2 should no longer be present in the test_view cull_set.
   EXPECT_EQ(2U, test_view->last_cull_set_.size());
   EXPECT_EQ(0U, test_view->last_cull_set_.count(v1));
   EXPECT_EQ(0U, test_view->last_cull_set_.count(v2));
 
   // View v1 and v2 are no longer part of view hierarchy and therefore won't be
   // deleted with that hierarchy.
   delete v1;
 }
 
@@ skipping 10 matching lines @@
   v2->SetBoundsRect(gfx::Rect(5, 10, 40, 50));
   v1->AddChildView(v2);
 
   View* v3 = new View;
   v3->SetBoundsRect(gfx::Rect(1, 2, 3, 4));
   v2->AddChildView(v3);
 
   // Schedule a full-view paint and ensure all views are present in the cull.
   test_view->SchedulePaintInRect(test_view->bounds());
   GetRootLayer()->GetCompositor()->ScheduleDraw();
-  ui::DrawWaiterForTest::WaitForCompositingEnded(
-      GetRootLayer()->GetCompositor());
+  ui::DrawWaiterForTest::Wait(GetRootLayer()->GetCompositor());
   EXPECT_EQ(5U, test_view->last_cull_set_.size());
   EXPECT_EQ(1U, test_view->last_cull_set_.count(widget()->GetRootView()));
   EXPECT_EQ(1U, test_view->last_cull_set_.count(test_view));
   EXPECT_EQ(1U, test_view->last_cull_set_.count(v1));
   EXPECT_EQ(1U, test_view->last_cull_set_.count(v2));
   EXPECT_EQ(1U, test_view->last_cull_set_.count(v3));
 
   // Build an unrelated view hierarchy and move v2 in to it.
   scoped_ptr<Widget> test_widget(new Widget);
   Widget::InitParams params = CreateParams(Widget::InitParams::TYPE_POPUP);
   params.bounds = gfx::Rect(10, 10, 500, 500);
   params.ownership = Widget::InitParams::WIDGET_OWNS_NATIVE_WIDGET;
   test_widget->Init(params);
   test_widget->Show();
   BoundsTreeTestView* widget_view = new BoundsTreeTestView;
   test_widget->SetContentsView(widget_view);
   widget_view->AddChildView(v2);
 
   // Now schedule full-view paints in both widgets.
   test_view->SchedulePaintInRect(test_view->bounds());
   widget_view->SchedulePaintInRect(widget_view->bounds());
   GetRootLayer()->GetCompositor()->ScheduleDraw();
-  ui::DrawWaiterForTest::WaitForCompositingEnded(
-      GetRootLayer()->GetCompositor());
+  ui::DrawWaiterForTest::Wait(GetRootLayer()->GetCompositor());
 
   // Only v1 should be present in the first cull set.
   EXPECT_EQ(3U, test_view->last_cull_set_.size());
   EXPECT_EQ(1U, test_view->last_cull_set_.count(widget()->GetRootView()));
   EXPECT_EQ(1U, test_view->last_cull_set_.count(test_view));
   EXPECT_EQ(1U, test_view->last_cull_set_.count(v1));
 
   // We should find v2 and v3 in the widget_view cull_set.
   EXPECT_EQ(4U, widget_view->last_cull_set_.size());
   EXPECT_EQ(1U, widget_view->last_cull_set_.count(test_widget->GetRootView()));
@@ skipping 62 matching lines @@
   // notification.
   TestView* test_view_child_2 = new TestView();
   test_view->AddChildView(test_view_child_2);
   EXPECT_TRUE(test_view_child_2->native_theme_);
   EXPECT_EQ(widget->GetNativeTheme(), test_view_child_2->native_theme_);
 
   widget->CloseNow();
 }
 
 }  // namespace views