Fix failing (flaky) LayerTreeHostTestLCDNotification test.

cc/scheduler/scheduler.h

 // Copyright 2011 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.
 
 #ifndef CC_SCHEDULER_SCHEDULER_H_
 #define CC_SCHEDULER_SCHEDULER_H_
 
 #include <deque>
 #include <string>
 
@@ skipping 80 matching lines @@
 
   void SetSmoothnessTakesPriority(bool smoothness_takes_priority);
 
   void NotifyReadyToCommit();
   void BeginMainFrameAborted(bool did_handle);
 
   void DidManageTiles();
   void DidLoseOutputSurface();
   void DidCreateAndInitializeOutputSurface();
 
+  // Tests do not want to shut down until all possible BeginMainFrames have
+  // occured to prevent flakiness.
+  bool MainFrameForTestingWillHappen() const {

[enne (OOO), 2014/08/11 19:50:12]

bikeshed: Will => Could?

[danakj, 2014/08/11 20:01:06]

I had that at first, but it definitely will come, just maybe not right *now*,
cuz needs_commit_ is true so it'll come next vsync or something. So.. idk, I
slightly prefer Will over Could for this.

[enne (OOO), 2014/08/11 20:05:02]

Ok, sure.  :)

+    return state_machine_.CommitPending() ||
+           state_machine_.CouldSendBeginMainFrame();
+  }
+
   bool CommitPending() const { return state_machine_.CommitPending(); }
   bool RedrawPending() const { return state_machine_.RedrawPending(); }
   bool ManageTilesPending() const {
     return state_machine_.ManageTilesPending();
   }
   bool MainThreadIsInHighLatencyMode() const {
     return state_machine_.MainThreadIsInHighLatencyMode();
   }
   bool BeginImplFrameDeadlinePending() const {
     return !begin_impl_frame_deadline_task_.IsCancelled();
@@ skipping 116 matching lines @@
   void SetupSyntheticBeginFrames();
 
   base::WeakPtrFactory<Scheduler> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(Scheduler);
 };
 
 }  // namespace cc
 
 #endif  // CC_SCHEDULER_SCHEDULER_H_