| Index: cc/scheduler/scheduler_unittest.cc
|
| diff --git a/cc/scheduler/scheduler_unittest.cc b/cc/scheduler/scheduler_unittest.cc
|
| index 1dfb37d9d417fc9dc1da12970a4bcd7f0eacd9e3..c20defa95770b2b7c0ae7ce23f53d55630a6d103 100644
|
| --- a/cc/scheduler/scheduler_unittest.cc
|
| +++ b/cc/scheduler/scheduler_unittest.cc
|
| @@ -269,16 +269,13 @@ class SchedulerTest : public testing::Test {
|
|
|
| protected:
|
| TestScheduler* CreateScheduler() {
|
| - scoped_ptr<FakeExternalBeginFrameSource> fake_external_begin_frame_source;
|
| if (scheduler_settings_.use_external_begin_frame_source) {
|
| - fake_external_begin_frame_source.reset(
|
| + fake_external_begin_frame_source_.reset(
|
| new FakeExternalBeginFrameSource(client_.get()));
|
| - fake_external_begin_frame_source_ =
|
| - fake_external_begin_frame_source.get();
|
| }
|
| - scheduler_ = TestScheduler::Create(now_src_.get(), client_.get(),
|
| - scheduler_settings_, 0, task_runner_,
|
| - fake_external_begin_frame_source.Pass());
|
| + scheduler_ = TestScheduler::Create(
|
| + now_src_.get(), client_.get(), scheduler_settings_, 0,
|
| + task_runner_.get(), fake_external_begin_frame_source_.get());
|
| DCHECK(scheduler_);
|
| client_->set_scheduler(scheduler_.get());
|
| return scheduler_.get();
|
| @@ -415,7 +412,7 @@ class SchedulerTest : public testing::Test {
|
| }
|
|
|
| FakeExternalBeginFrameSource* fake_external_begin_frame_source() const {
|
| - return fake_external_begin_frame_source_;
|
| + return fake_external_begin_frame_source_.get();
|
| }
|
|
|
| void MainFrameInHighLatencyMode(
|
| @@ -434,7 +431,7 @@ class SchedulerTest : public testing::Test {
|
|
|
| scoped_ptr<base::SimpleTestTickClock> now_src_;
|
| scoped_refptr<OrderedSimpleTaskRunner> task_runner_;
|
| - FakeExternalBeginFrameSource* fake_external_begin_frame_source_;
|
| + scoped_ptr<FakeExternalBeginFrameSource> fake_external_begin_frame_source_;
|
| SchedulerSettings scheduler_settings_;
|
| scoped_ptr<FakeSchedulerClient> client_;
|
| scoped_ptr<TestScheduler> scheduler_;
|
|
|