Revert of cc: Control defer_commits logic by Scheduler

cc/trees/layer_tree_host_unittest_context.cc

 // Copyright 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 "cc/trees/layer_tree_host.h"
 
 #include "base/basictypes.h"
 #include "cc/layers/content_layer.h"
 #include "cc/layers/delegated_frame_provider.h"
 #include "cc/layers/delegated_frame_resource_collection.h"
@@ skipping 1758 matching lines @@
     deferred_ = false;
     PostSetNeedsCommitToMainThread();
   }
 
   void ScheduledActionWillSendBeginMainFrame() override {
     if (deferred_)
       return;
     deferred_ = true;
 
     // Defer commits before the BeginFrame arrives, causing it to be delayed.
-    PostSetDeferCommitsToMainThread(true);
+    MainThreadTaskRunner()->PostTask(
+        FROM_HERE,
+        base::Bind(&LayerTreeHostContextTestLoseAfterSendingBeginMainFrame::
+                       DeferCommitsOnMainThread,
+                   base::Unretained(this),
+                   true));
     // Meanwhile, lose the context while we are in defer commits.
     ImplThreadTaskRunner()->PostTask(
         FROM_HERE,
         base::Bind(&LayerTreeHostContextTestLoseAfterSendingBeginMainFrame::
                        LoseContextOnImplThread,
                    base::Unretained(this)));
   }
 
   void LoseContextOnImplThread() {
     LoseContext();
 
     // After losing the context, stop deferring commits.
-    PostSetDeferCommitsToMainThread(false);
+    MainThreadTaskRunner()->PostTask(
+        FROM_HERE,
+        base::Bind(&LayerTreeHostContextTestLoseAfterSendingBeginMainFrame::
+                       DeferCommitsOnMainThread,
+                   base::Unretained(this),
+                   false));
+  }
+
+  void DeferCommitsOnMainThread(bool defer_commits) {
+    layer_tree_host()->SetDeferCommits(defer_commits);
   }
 
   void WillBeginMainFrame() override {
     // Don't begin a frame with a lost surface.
     EXPECT_FALSE(layer_tree_host()->output_surface_lost());
   }
 
   void DidCommitAndDrawFrame() override { EndTest(); }
 
   void AfterTest() override {}
 
   bool deferred_;
 };
 
 SINGLE_AND_MULTI_THREAD_TEST_F(
     LayerTreeHostContextTestLoseAfterSendingBeginMainFrame);
 
 }  // namespace
 }  // namespace cc