Revert 287747 "Make SingleThreadProxy a SchedulerClient"

trunk/src/cc/trees/layer_tree_host_unittest.cc

Index: trunk/src/cc/trees/layer_tree_host_unittest.cc
===================================================================
--- trunk/src/cc/trees/layer_tree_host_unittest.cc	(revision 287765)
+++ trunk/src/cc/trees/layer_tree_host_unittest.cc	(working copy)
@@ -91,8 +91,8 @@
   }
 
   virtual void AfterTest() OVERRIDE {
-    EXPECT_LE(1, num_commits_);
-    EXPECT_LE(1, num_draws_);
+    EXPECT_GE(1, num_commits_);
+    EXPECT_GE(1, num_draws_);
   }
 
  private:
@@ -1967,7 +1967,7 @@
   int num_complete_commits_;
 };
 
-SINGLE_AND_MULTI_THREAD_TEST_F(LayerTreeHostTestDeferCommits);
+MULTI_THREAD_TEST_F(LayerTreeHostTestDeferCommits);
 
 class LayerTreeHostWithProxy : public LayerTreeHost {
  public:
@@ -2040,7 +2040,6 @@
 
   LayerTreeSettings settings;
   settings.max_partial_texture_updates = 4;
-  settings.single_thread_proxy_scheduler = false;
 
   scoped_ptr<SharedBitmapManager> shared_bitmap_manager(
       new TestSharedBitmapManager());
@@ -2060,7 +2059,6 @@
 
   LayerTreeSettings settings;
   settings.max_partial_texture_updates = 4;
-  settings.single_thread_proxy_scheduler = false;
 
   scoped_ptr<SharedBitmapManager> shared_bitmap_manager(
       new TestSharedBitmapManager());
@@ -2080,7 +2078,6 @@
 
   LayerTreeSettings settings;
   settings.max_partial_texture_updates = 4;
-  settings.single_thread_proxy_scheduler = false;
 
   scoped_ptr<SharedBitmapManager> shared_bitmap_manager(
       new TestSharedBitmapManager());
@@ -2101,7 +2098,6 @@
 
   LayerTreeSettings settings;
   settings.max_partial_texture_updates = 4;
-  settings.single_thread_proxy_scheduler = false;
 
   scoped_ptr<SharedBitmapManager> shared_bitmap_manager(
       new TestSharedBitmapManager());