| Index: cc/debug/micro_benchmark_controller_unittest.cc
|
| diff --git a/cc/debug/micro_benchmark_controller_unittest.cc b/cc/debug/micro_benchmark_controller_unittest.cc
|
| index 527e85034deb017ba8ead253813140ef17034d42..a5683c4ed14f94307cc50caed0d3d6d266dd234b 100644
|
| --- a/cc/debug/micro_benchmark_controller_unittest.cc
|
| +++ b/cc/debug/micro_benchmark_controller_unittest.cc
|
| @@ -54,14 +54,14 @@ void IncrementCallCount(int* count, scoped_ptr<base::Value> value) {
|
|
|
| TEST_F(MicroBenchmarkControllerTest, ScheduleFail) {
|
| int id = layer_tree_host_->ScheduleMicroBenchmark(
|
| - "non_existant_benchmark", scoped_ptr<base::Value>(), base::Bind(&Noop));
|
| + "non_existant_benchmark", nullptr, base::Bind(&Noop));
|
| EXPECT_EQ(id, 0);
|
| }
|
|
|
| TEST_F(MicroBenchmarkControllerTest, CommitScheduled) {
|
| EXPECT_FALSE(layer_tree_host_->needs_commit());
|
| int id = layer_tree_host_->ScheduleMicroBenchmark(
|
| - "unittest_only_benchmark", scoped_ptr<base::Value>(), base::Bind(&Noop));
|
| + "unittest_only_benchmark", nullptr, base::Bind(&Noop));
|
| EXPECT_GT(id, 0);
|
| EXPECT_TRUE(layer_tree_host_->needs_commit());
|
| }
|
| @@ -70,7 +70,7 @@ TEST_F(MicroBenchmarkControllerTest, BenchmarkRan) {
|
| int run_count = 0;
|
| int id = layer_tree_host_->ScheduleMicroBenchmark(
|
| "unittest_only_benchmark",
|
| - scoped_ptr<base::Value>(),
|
| + nullptr,
|
| base::Bind(&IncrementCallCount, base::Unretained(&run_count)));
|
| EXPECT_GT(id, 0);
|
|
|
| @@ -85,12 +85,12 @@ TEST_F(MicroBenchmarkControllerTest, MultipleBenchmarkRan) {
|
| int run_count = 0;
|
| int id = layer_tree_host_->ScheduleMicroBenchmark(
|
| "unittest_only_benchmark",
|
| - scoped_ptr<base::Value>(),
|
| + nullptr,
|
| base::Bind(&IncrementCallCount, base::Unretained(&run_count)));
|
| EXPECT_GT(id, 0);
|
| id = layer_tree_host_->ScheduleMicroBenchmark(
|
| "unittest_only_benchmark",
|
| - scoped_ptr<base::Value>(),
|
| + nullptr,
|
| base::Bind(&IncrementCallCount, base::Unretained(&run_count)));
|
| EXPECT_GT(id, 0);
|
|
|
| @@ -102,12 +102,12 @@ TEST_F(MicroBenchmarkControllerTest, MultipleBenchmarkRan) {
|
|
|
| id = layer_tree_host_->ScheduleMicroBenchmark(
|
| "unittest_only_benchmark",
|
| - scoped_ptr<base::Value>(),
|
| + nullptr,
|
| base::Bind(&IncrementCallCount, base::Unretained(&run_count)));
|
| EXPECT_GT(id, 0);
|
| id = layer_tree_host_->ScheduleMicroBenchmark(
|
| "unittest_only_benchmark",
|
| - scoped_ptr<base::Value>(),
|
| + nullptr,
|
| base::Bind(&IncrementCallCount, base::Unretained(&run_count)));
|
| EXPECT_GT(id, 0);
|
|
|
| @@ -155,7 +155,7 @@ TEST_F(MicroBenchmarkControllerTest, SendMessage) {
|
| int run_count = 0;
|
| int id = layer_tree_host_->ScheduleMicroBenchmark(
|
| "unittest_only_benchmark",
|
| - scoped_ptr<base::Value>(),
|
| + nullptr,
|
| base::Bind(&IncrementCallCount, base::Unretained(&run_count)));
|
| EXPECT_GT(id, 0);
|
|
|
|
|