cc: Remove ThreadProxy dependency on LTHI::CurrentBeginFrameArgs

cc/scheduler/scheduler_unittest.cc

 // 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.
 
 #include "cc/scheduler/scheduler.h"
 
 #include <string>
 #include <vector>
 
 #include "base/logging.h"
@@ skipping 45 matching lines @@
   void Reset() {
     actions_.clear();
     states_.clear();
     animate_causes_redraw_ = false;
     animate_causes_animate_ = false;
     will_begin_impl_frame_requests_one_begin_impl_frame_ = false;
     draw_will_happen_ = true;
     swap_will_happen_if_draw_happens_ = true;
     num_draws_ = 0;
     begin_frame_args_sent_to_children_ = BeginFrameArgs();
+    last_begin_main_frame_args_ = BeginFrameArgs();
   }
 
   void set_scheduler(TestScheduler* scheduler) { scheduler_ = scheduler; }
 
   bool needs_begin_frames() {
     return scheduler_->frame_source().NeedsBeginFrames();
   }
   int num_draws() const { return num_draws_; }
   int num_actions_() const { return static_cast<int>(actions_.size()); }
   const char* Action(int i) const { return actions_[i]; }
@@ skipping 32 matching lines @@
     automatic_swap_ack_ = automatic_swap_ack;
   }
   // SchedulerClient implementation.
   void WillBeginImplFrame(const BeginFrameArgs& args) override {
     PushAction("WillBeginImplFrame");
     if (will_begin_impl_frame_requests_one_begin_impl_frame_)
       scheduler_->SetNeedsOneBeginImplFrame();
   }
   void DidFinishImplFrame() override {}
 
-  void ScheduledActionSendBeginMainFrame() override {
+  void ScheduledActionSendBeginMainFrame(const BeginFrameArgs& args) override {
     PushAction("ScheduledActionSendBeginMainFrame");
+    last_begin_main_frame_args_ = args;
   }
+
+  const BeginFrameArgs& last_begin_main_frame_args() {
+    return last_begin_main_frame_args_;
+  }
+
   void ScheduledActionAnimate() override {
     PushAction("ScheduledActionAnimate");
     if (animate_causes_redraw_)
       scheduler_->SetNeedsRedraw();
     if (animate_causes_animate_)
       scheduler_->SetNeedsAnimate();
   }
   DrawResult ScheduledActionDrawAndSwapIfPossible() override {
     PushAction("ScheduledActionDrawAndSwapIfPossible");
     num_draws_++;
@@ skipping 66 matching lines @@
   }
 
   bool animate_causes_redraw_;
   bool animate_causes_animate_;
   bool will_begin_impl_frame_requests_one_begin_impl_frame_;
   bool draw_will_happen_;
   bool swap_will_happen_if_draw_happens_;
   bool automatic_swap_ack_;
   int num_draws_;
   BeginFrameArgs begin_frame_args_sent_to_children_;
+  BeginFrameArgs last_begin_main_frame_args_;
   base::TimeTicks posted_begin_impl_frame_deadline_;
   std::vector<const char*> actions_;
   std::vector<scoped_refptr<base::trace_event::ConvertableToTraceFormat>>
       states_;
   TestScheduler* scheduler_;
 };
 
 class FakeExternalBeginFrameSource : public BeginFrameSourceBase {
  public:
   explicit FakeExternalBeginFrameSource(FakeSchedulerClient* client)
@@ skipping 3261 matching lines @@
 
 TEST_F(SchedulerTest, ImplLatencyTakesPriority) {
   SetUpScheduler(true);
   scheduler_->SetImplLatencyTakesPriority(true);
   EXPECT_TRUE(scheduler_->ImplLatencyTakesPriority());
 
   scheduler_->SetImplLatencyTakesPriority(false);
   EXPECT_FALSE(scheduler_->ImplLatencyTakesPriority());
 }
 
-TEST_F(SchedulerTest, BeginFrameArgs_OnCriticalPath) {
+TEST_F(SchedulerTest, BeginMainFrameArgs_OnCriticalPath) {
   scheduler_settings_.use_external_begin_frame_source = true;
   SetUpScheduler(true);
 
   scheduler_->SetImplLatencyTakesPriority(false);
-  scheduler_->SetChildrenNeedBeginFrames(true);
+  scheduler_->SetNeedsBeginMainFrame();
 
+  client_->Reset();
+  EXPECT_FALSE(client_->last_begin_main_frame_args().IsValid());
   EXPECT_SCOPED(AdvanceFrame());
-  EXPECT_TRUE(client_->begin_frame_is_sent_to_children());
-  EXPECT_TRUE(client_->begin_frame_args_sent_to_children().on_critical_path);
+  EXPECT_TRUE(client_->last_begin_main_frame_args().IsValid());
+  EXPECT_TRUE(client_->last_begin_main_frame_args().on_critical_path);
 }
 
-TEST_F(SchedulerTest, BeginFrameArgs_NotOnCriticalPath) {
+TEST_F(SchedulerTest, BeginMainFrameArgs_NotOnCriticalPath) {
   scheduler_settings_.use_external_begin_frame_source = true;
   SetUpScheduler(true);
 
   scheduler_->SetImplLatencyTakesPriority(true);
-  scheduler_->SetChildrenNeedBeginFrames(true);
+  scheduler_->SetNeedsBeginMainFrame();
 
+  client_->Reset();
+  EXPECT_FALSE(client_->last_begin_main_frame_args().IsValid());
   EXPECT_SCOPED(AdvanceFrame());
-  EXPECT_TRUE(client_->begin_frame_is_sent_to_children());
-  EXPECT_FALSE(client_->begin_frame_args_sent_to_children().on_critical_path);
+  EXPECT_TRUE(client_->last_begin_main_frame_args().IsValid());
+  EXPECT_FALSE(client_->last_begin_main_frame_args().on_critical_path);
 }
 
 }  // namespace
 }  // namespace cc