Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(76)

Side by Side Diff: cc/debug/micro_benchmark_controller_unittest.cc

Issue 657103003: cc: Change scoped_ptr<T>() to nullptr. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "base/callback.h" 5 #include "base/callback.h"
6 #include "base/memory/scoped_ptr.h" 6 #include "base/memory/scoped_ptr.h"
7 #include "cc/debug/micro_benchmark.h" 7 #include "cc/debug/micro_benchmark.h"
8 #include "cc/debug/micro_benchmark_controller.h" 8 #include "cc/debug/micro_benchmark_controller.h"
9 #include "cc/layers/layer.h" 9 #include "cc/layers/layer.h"
10 #include "cc/resources/resource_update_queue.h" 10 #include "cc/resources/resource_update_queue.h"
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
47 47
48 void Noop(scoped_ptr<base::Value> value) { 48 void Noop(scoped_ptr<base::Value> value) {
49 } 49 }
50 50
51 void IncrementCallCount(int* count, scoped_ptr<base::Value> value) { 51 void IncrementCallCount(int* count, scoped_ptr<base::Value> value) {
52 ++(*count); 52 ++(*count);
53 } 53 }
54 54
55 TEST_F(MicroBenchmarkControllerTest, ScheduleFail) { 55 TEST_F(MicroBenchmarkControllerTest, ScheduleFail) {
56 int id = layer_tree_host_->ScheduleMicroBenchmark( 56 int id = layer_tree_host_->ScheduleMicroBenchmark(
57 "non_existant_benchmark", scoped_ptr<base::Value>(), base::Bind(&Noop)); 57 "non_existant_benchmark", nullptr, base::Bind(&Noop));
58 EXPECT_EQ(id, 0); 58 EXPECT_EQ(id, 0);
59 } 59 }
60 60
61 TEST_F(MicroBenchmarkControllerTest, CommitScheduled) { 61 TEST_F(MicroBenchmarkControllerTest, CommitScheduled) {
62 EXPECT_FALSE(layer_tree_host_->needs_commit()); 62 EXPECT_FALSE(layer_tree_host_->needs_commit());
63 int id = layer_tree_host_->ScheduleMicroBenchmark( 63 int id = layer_tree_host_->ScheduleMicroBenchmark(
64 "unittest_only_benchmark", scoped_ptr<base::Value>(), base::Bind(&Noop)); 64 "unittest_only_benchmark", nullptr, base::Bind(&Noop));
65 EXPECT_GT(id, 0); 65 EXPECT_GT(id, 0);
66 EXPECT_TRUE(layer_tree_host_->needs_commit()); 66 EXPECT_TRUE(layer_tree_host_->needs_commit());
67 } 67 }
68 68
69 TEST_F(MicroBenchmarkControllerTest, BenchmarkRan) { 69 TEST_F(MicroBenchmarkControllerTest, BenchmarkRan) {
70 int run_count = 0; 70 int run_count = 0;
71 int id = layer_tree_host_->ScheduleMicroBenchmark( 71 int id = layer_tree_host_->ScheduleMicroBenchmark(
72 "unittest_only_benchmark", 72 "unittest_only_benchmark",
73 scoped_ptr<base::Value>(), 73 nullptr,
74 base::Bind(&IncrementCallCount, base::Unretained(&run_count))); 74 base::Bind(&IncrementCallCount, base::Unretained(&run_count)));
75 EXPECT_GT(id, 0); 75 EXPECT_GT(id, 0);
76 76
77 scoped_ptr<ResourceUpdateQueue> queue(new ResourceUpdateQueue); 77 scoped_ptr<ResourceUpdateQueue> queue(new ResourceUpdateQueue);
78 layer_tree_host_->SetOutputSurfaceLostForTesting(false); 78 layer_tree_host_->SetOutputSurfaceLostForTesting(false);
79 layer_tree_host_->UpdateLayers(queue.get()); 79 layer_tree_host_->UpdateLayers(queue.get());
80 80
81 EXPECT_EQ(1, run_count); 81 EXPECT_EQ(1, run_count);
82 } 82 }
83 83
84 TEST_F(MicroBenchmarkControllerTest, MultipleBenchmarkRan) { 84 TEST_F(MicroBenchmarkControllerTest, MultipleBenchmarkRan) {
85 int run_count = 0; 85 int run_count = 0;
86 int id = layer_tree_host_->ScheduleMicroBenchmark( 86 int id = layer_tree_host_->ScheduleMicroBenchmark(
87 "unittest_only_benchmark", 87 "unittest_only_benchmark",
88 scoped_ptr<base::Value>(), 88 nullptr,
89 base::Bind(&IncrementCallCount, base::Unretained(&run_count))); 89 base::Bind(&IncrementCallCount, base::Unretained(&run_count)));
90 EXPECT_GT(id, 0); 90 EXPECT_GT(id, 0);
91 id = layer_tree_host_->ScheduleMicroBenchmark( 91 id = layer_tree_host_->ScheduleMicroBenchmark(
92 "unittest_only_benchmark", 92 "unittest_only_benchmark",
93 scoped_ptr<base::Value>(), 93 nullptr,
94 base::Bind(&IncrementCallCount, base::Unretained(&run_count))); 94 base::Bind(&IncrementCallCount, base::Unretained(&run_count)));
95 EXPECT_GT(id, 0); 95 EXPECT_GT(id, 0);
96 96
97 scoped_ptr<ResourceUpdateQueue> queue(new ResourceUpdateQueue); 97 scoped_ptr<ResourceUpdateQueue> queue(new ResourceUpdateQueue);
98 layer_tree_host_->SetOutputSurfaceLostForTesting(false); 98 layer_tree_host_->SetOutputSurfaceLostForTesting(false);
99 layer_tree_host_->UpdateLayers(queue.get()); 99 layer_tree_host_->UpdateLayers(queue.get());
100 100
101 EXPECT_EQ(2, run_count); 101 EXPECT_EQ(2, run_count);
102 102
103 id = layer_tree_host_->ScheduleMicroBenchmark( 103 id = layer_tree_host_->ScheduleMicroBenchmark(
104 "unittest_only_benchmark", 104 "unittest_only_benchmark",
105 scoped_ptr<base::Value>(), 105 nullptr,
106 base::Bind(&IncrementCallCount, base::Unretained(&run_count))); 106 base::Bind(&IncrementCallCount, base::Unretained(&run_count)));
107 EXPECT_GT(id, 0); 107 EXPECT_GT(id, 0);
108 id = layer_tree_host_->ScheduleMicroBenchmark( 108 id = layer_tree_host_->ScheduleMicroBenchmark(
109 "unittest_only_benchmark", 109 "unittest_only_benchmark",
110 scoped_ptr<base::Value>(), 110 nullptr,
111 base::Bind(&IncrementCallCount, base::Unretained(&run_count))); 111 base::Bind(&IncrementCallCount, base::Unretained(&run_count)));
112 EXPECT_GT(id, 0); 112 EXPECT_GT(id, 0);
113 113
114 layer_tree_host_->UpdateLayers(queue.get()); 114 layer_tree_host_->UpdateLayers(queue.get());
115 EXPECT_EQ(4, run_count); 115 EXPECT_EQ(4, run_count);
116 116
117 layer_tree_host_->UpdateLayers(queue.get()); 117 layer_tree_host_->UpdateLayers(queue.get());
118 EXPECT_EQ(4, run_count); 118 EXPECT_EQ(4, run_count);
119 } 119 }
120 120
(...skipping 27 matching lines...) Expand all
148 scoped_ptr<base::DictionaryValue> message(new base::DictionaryValue); 148 scoped_ptr<base::DictionaryValue> message(new base::DictionaryValue);
149 message->SetBoolean("can_handle", true); 149 message->SetBoolean("can_handle", true);
150 bool message_handled = 150 bool message_handled =
151 layer_tree_host_->SendMessageToMicroBenchmark(0, message.Pass()); 151 layer_tree_host_->SendMessageToMicroBenchmark(0, message.Pass());
152 EXPECT_FALSE(message_handled); 152 EXPECT_FALSE(message_handled);
153 153
154 // Schedule a benchmark 154 // Schedule a benchmark
155 int run_count = 0; 155 int run_count = 0;
156 int id = layer_tree_host_->ScheduleMicroBenchmark( 156 int id = layer_tree_host_->ScheduleMicroBenchmark(
157 "unittest_only_benchmark", 157 "unittest_only_benchmark",
158 scoped_ptr<base::Value>(), 158 nullptr,
159 base::Bind(&IncrementCallCount, base::Unretained(&run_count))); 159 base::Bind(&IncrementCallCount, base::Unretained(&run_count)));
160 EXPECT_GT(id, 0); 160 EXPECT_GT(id, 0);
161 161
162 // Send valid message to valid benchmark 162 // Send valid message to valid benchmark
163 message = make_scoped_ptr(new base::DictionaryValue); 163 message = make_scoped_ptr(new base::DictionaryValue);
164 message->SetBoolean("can_handle", true); 164 message->SetBoolean("can_handle", true);
165 message_handled = 165 message_handled =
166 layer_tree_host_->SendMessageToMicroBenchmark(id, message.Pass()); 166 layer_tree_host_->SendMessageToMicroBenchmark(id, message.Pass());
167 EXPECT_TRUE(message_handled); 167 EXPECT_TRUE(message_handled);
168 168
169 // Send invalid message to valid benchmark 169 // Send invalid message to valid benchmark
170 message = make_scoped_ptr(new base::DictionaryValue); 170 message = make_scoped_ptr(new base::DictionaryValue);
171 message->SetBoolean("can_handle", false); 171 message->SetBoolean("can_handle", false);
172 message_handled = 172 message_handled =
173 layer_tree_host_->SendMessageToMicroBenchmark(id, message.Pass()); 173 layer_tree_host_->SendMessageToMicroBenchmark(id, message.Pass());
174 EXPECT_FALSE(message_handled); 174 EXPECT_FALSE(message_handled);
175 } 175 }
176 176
177 } // namespace 177 } // namespace
178 } // namespace cc 178 } // namespace cc
OLDNEW
« no previous file with comments | « cc/animation/layer_animation_controller_unittest.cc ('k') | cc/debug/unittest_only_benchmark.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698