Update from https://crrev.com/308996

cc/test/scheduler_test_common.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_TEST_SCHEDULER_TEST_COMMON_H_
 #define CC_TEST_SCHEDULER_TEST_COMMON_H_
 
 #include <string>
 
 #include "base/basictypes.h"
@@ skipping 164 matching lines @@
                                    power_monitor,
                                    &frame_sources_constructor,
                                    external_begin_frame_source.Pass()));
   }
 
   // Extra test helper functionality
   bool IsBeginRetroFrameArgsEmpty() const {
     return begin_retro_frame_args_.empty();
   }
 
+  bool CanStart() const { return state_machine_.CanStartForTesting(); }
+
   BeginFrameSource& frame_source() { return *frame_source_; }
 
   ~TestScheduler() override;
 
+  void NotifyReadyToCommitThenActivateIfNeeded() {
+    NotifyReadyToCommit();
+    if (settings_.impl_side_painting) {
+      NotifyReadyToActivate();
+    }
+  }
+
  protected:
   // Overridden from Scheduler.
   base::TimeTicks Now() const override;
 
  private:
   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,
       scoped_ptr<BeginFrameSource> external_begin_frame_source);
 
   scoped_refptr<TestNowSource> now_src_;
 };
 
 }  // namespace cc
 
 #endif  // CC_TEST_SCHEDULER_TEST_COMMON_H_