Update from https://crrev.com/304121

cc/test/scheduler_test_common.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/test/scheduler_test_common.h"
 
 #include <string>
 
 #include "base/logging.h"
 
@@ skipping 66 matching lines @@
   if (!scheduler->settings_.throttle_frame_production) {
     TRACE_EVENT1(
         "cc",
         "TestSchedulerFrameSourcesConstructor::ConstructPrimaryFrameSource",
         "source",
         "TestBackToBackBeginFrameSource");
     DCHECK(!scheduler->primary_frame_source_internal_);
     scheduler->primary_frame_source_internal_ =
         TestBackToBackBeginFrameSource::Create(now_src_, test_task_runner_);
     return scheduler->primary_frame_source_internal_.get();
-  } else if (scheduler->settings_.begin_frame_scheduling_enabled) {
+  } else if (scheduler->settings_.use_external_begin_frame_source) {
     return SchedulerFrameSourcesConstructor::ConstructPrimaryFrameSource(
         scheduler);
   } else {
     TRACE_EVENT1(
         "cc",
         "TestSchedulerFrameSourcesConstructor::ConstructPrimaryFrameSource",
         "source",
         "TestSyntheticBeginFrameSource");
     scoped_ptr<TestSyntheticBeginFrameSource> synthetic_source =
         TestSyntheticBeginFrameSource::Create(
@@ skipping 23 matching lines @@
   return scheduler->background_frame_source_internal_.get();
 }
 
 TestScheduler::TestScheduler(
     scoped_refptr<TestNowSource> now_src,
     SchedulerClient* client,
     const SchedulerSettings& scheduler_settings,
     int layer_tree_host_id,
     const scoped_refptr<OrderedSimpleTaskRunner>& test_task_runner,
     base::PowerMonitor* power_monitor,
-    TestSchedulerFrameSourcesConstructor* frame_sources_constructor)
+    TestSchedulerFrameSourcesConstructor* frame_sources_constructor,
+    scoped_ptr<BeginFrameSource> external_begin_frame_source)
     : Scheduler(client,
                 scheduler_settings,
                 layer_tree_host_id,
                 test_task_runner,
                 power_monitor,
+                external_begin_frame_source.Pass(),
                 frame_sources_constructor),
       now_src_(now_src) {
 }
 
 base::TimeTicks TestScheduler::Now() const {
   return now_src_->Now();
 }
 
 TestScheduler::~TestScheduler() {
 }
 
 }  // namespace cc