OLD | NEW |
---|---|
1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 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/bind.h" | 5 #include "base/bind.h" |
6 #include "base/trace_event/trace_event.h" | |
6 #include "content/public/browser/background_tracing_manager.h" | 7 #include "content/public/browser/background_tracing_manager.h" |
7 #include "content/public/browser/background_tracing_preemptive_config.h" | 8 #include "content/public/browser/background_tracing_preemptive_config.h" |
8 #include "content/public/browser/background_tracing_reactive_config.h" | 9 #include "content/public/browser/background_tracing_reactive_config.h" |
9 #include "content/public/test/content_browser_test.h" | 10 #include "content/public/test/content_browser_test.h" |
10 #include "content/public/test/content_browser_test_utils.h" | 11 #include "content/public/test/content_browser_test_utils.h" |
11 #include "content/public/test/test_utils.h" | 12 #include "content/public/test/test_utils.h" |
13 #include "third_party/zlib/zlib.h" | |
12 | 14 |
13 namespace content { | 15 namespace content { |
14 | 16 |
15 class BackgroundTracingManagerBrowserTest : public ContentBrowserTest { | 17 class BackgroundTracingManagerBrowserTest : public ContentBrowserTest { |
16 public: | 18 public: |
17 BackgroundTracingManagerBrowserTest() {} | 19 BackgroundTracingManagerBrowserTest() {} |
18 | 20 |
19 private: | 21 private: |
20 DISALLOW_COPY_AND_ASSIGN(BackgroundTracingManagerBrowserTest); | 22 DISALLOW_COPY_AND_ASSIGN(BackgroundTracingManagerBrowserTest); |
21 }; | 23 }; |
22 | 24 |
23 class BackgroundTracingManagerUploadConfigWrapper { | 25 class BackgroundTracingManagerUploadConfigWrapper { |
24 public: | 26 public: |
25 BackgroundTracingManagerUploadConfigWrapper(const base::Closure& callback) | 27 BackgroundTracingManagerUploadConfigWrapper(const base::Closure& callback) |
26 : callback_(callback), receive_count_(0) { | 28 : callback_(callback), receive_count_(0) { |
27 receive_callback_ = | 29 receive_callback_ = |
28 base::Bind(&BackgroundTracingManagerUploadConfigWrapper::Upload, | 30 base::Bind(&BackgroundTracingManagerUploadConfigWrapper::Upload, |
29 base::Unretained(this)); | 31 base::Unretained(this)); |
30 } | 32 } |
31 | 33 |
32 void Upload(const base::RefCountedString* file_contents, | 34 void Upload(const scoped_refptr<base::RefCountedString>& file_contents, |
33 base::Callback<void()> done_callback) { | 35 base::Callback<void()> done_callback) { |
34 receive_count_ += 1; | 36 receive_count_ += 1; |
37 EXPECT_TRUE(file_contents); | |
35 | 38 |
39 size_t compressed_length = file_contents->data().length(); | |
40 const size_t output_buffer_length = 10 * 1024 * 1024; | |
41 std::vector<char> output_str(output_buffer_length); | |
42 | |
43 z_stream stream = {0}; | |
44 stream.total_in = stream.avail_in = compressed_length; | |
45 stream.total_out = stream.avail_out = output_buffer_length; | |
46 stream.next_in = (Bytef*)&file_contents->data()[0]; | |
47 stream.next_out = (Bytef*)&output_str[0]; | |
48 | |
49 stream.zalloc = Z_NULL; | |
50 stream.zfree = Z_NULL; | |
51 stream.opaque = Z_NULL; | |
52 | |
53 int result = inflateInit2(&stream, 16 + MAX_WBITS); | |
54 EXPECT_EQ(Z_OK, result); | |
55 result = inflate(&stream, Z_FINISH); | |
56 bool success = (result != Z_STREAM_ERROR); | |
57 inflateEnd(&stream); | |
58 EXPECT_TRUE(success); | |
59 | |
60 last_file_contents_ = &output_str[0]; | |
36 BrowserThread::PostTask(BrowserThread::UI, FROM_HERE, | 61 BrowserThread::PostTask(BrowserThread::UI, FROM_HERE, |
37 base::Bind(done_callback)); | 62 base::Bind(done_callback)); |
38 BrowserThread::PostTask(BrowserThread::UI, FROM_HERE, | 63 BrowserThread::PostTask(BrowserThread::UI, FROM_HERE, |
39 base::Bind(callback_)); | 64 base::Bind(callback_)); |
40 } | 65 } |
41 | 66 |
67 bool TraceHasMatchingString(const char* str) { | |
68 return last_file_contents_.find(str) != std::string::npos; | |
69 } | |
70 | |
42 int get_receive_count() const { return receive_count_; } | 71 int get_receive_count() const { return receive_count_; } |
43 | 72 |
44 const BackgroundTracingManager::ReceiveCallback& get_receive_callback() | 73 const BackgroundTracingManager::ReceiveCallback& get_receive_callback() |
45 const { | 74 const { |
46 return receive_callback_; | 75 return receive_callback_; |
47 } | 76 } |
48 | 77 |
49 private: | 78 private: |
50 BackgroundTracingManager::ReceiveCallback receive_callback_; | 79 BackgroundTracingManager::ReceiveCallback receive_callback_; |
51 base::Closure callback_; | 80 base::Closure callback_; |
52 int receive_count_; | 81 int receive_count_; |
82 std::string last_file_contents_; | |
53 }; | 83 }; |
54 | 84 |
55 void StartedFinalizingCallback(base::Closure callback, | 85 void StartedFinalizingCallback(base::Closure callback, |
56 bool expected, | 86 bool expected, |
57 bool value) { | 87 bool value) { |
58 EXPECT_EQ(expected, value); | 88 EXPECT_EQ(expected, value); |
59 if (!callback.is_null()) | 89 if (!callback.is_null()) |
60 callback.Run(); | 90 callback.Run(); |
61 } | 91 } |
62 | 92 |
(...skipping 11 matching lines...) Expand all Loading... | |
74 return config.Pass(); | 104 return config.Pass(); |
75 } | 105 } |
76 | 106 |
77 void SetupBackgroundTracingManager() { | 107 void SetupBackgroundTracingManager() { |
78 content::BackgroundTracingManager::GetInstance() | 108 content::BackgroundTracingManager::GetInstance() |
79 ->InvalidateTriggerHandlesForTesting(); | 109 ->InvalidateTriggerHandlesForTesting(); |
80 } | 110 } |
81 | 111 |
82 void DisableScenarioWhenIdle() { | 112 void DisableScenarioWhenIdle() { |
83 BackgroundTracingManager::GetInstance()->SetActiveScenario( | 113 BackgroundTracingManager::GetInstance()->SetActiveScenario( |
84 NULL, BackgroundTracingManager::ReceiveCallback(), false); | 114 NULL, BackgroundTracingManager::ReceiveCallback(), base::Closure(), |
115 false); | |
85 } | 116 } |
86 | 117 |
87 // This tests that the endpoint receives the final trace data. | 118 // This tests that the endpoint receives the final trace data. |
88 IN_PROC_BROWSER_TEST_F(BackgroundTracingManagerBrowserTest, | 119 IN_PROC_BROWSER_TEST_F(BackgroundTracingManagerBrowserTest, |
89 ReceiveTraceFinalContentsOnTrigger) { | 120 ReceiveTraceFinalContentsOnTrigger) { |
90 { | 121 { |
91 SetupBackgroundTracingManager(); | 122 SetupBackgroundTracingManager(); |
92 | 123 |
93 base::RunLoop run_loop; | 124 base::RunLoop run_loop; |
94 BackgroundTracingManagerUploadConfigWrapper upload_config_wrapper( | 125 BackgroundTracingManagerUploadConfigWrapper upload_config_wrapper( |
95 run_loop.QuitClosure()); | 126 run_loop.QuitClosure()); |
96 | 127 |
97 scoped_ptr<BackgroundTracingPreemptiveConfig> config = | 128 scoped_ptr<BackgroundTracingPreemptiveConfig> config = |
98 CreatePreemptiveConfig(); | 129 CreatePreemptiveConfig(); |
99 | 130 |
100 BackgroundTracingManager::TriggerHandle handle = | 131 BackgroundTracingManager::TriggerHandle handle = |
101 BackgroundTracingManager::GetInstance()->RegisterTriggerType("test"); | 132 BackgroundTracingManager::GetInstance()->RegisterTriggerType("test"); |
102 | 133 |
103 BackgroundTracingManager::GetInstance()->SetActiveScenario( | 134 BackgroundTracingManager::GetInstance()->SetActiveScenario( |
104 config.Pass(), upload_config_wrapper.get_receive_callback(), true); | 135 config.Pass(), upload_config_wrapper.get_receive_callback(), |
136 base::Closure(), false); | |
105 | 137 |
106 BackgroundTracingManager::GetInstance()->WhenIdle( | 138 BackgroundTracingManager::GetInstance()->WhenIdle( |
107 base::Bind(&DisableScenarioWhenIdle)); | 139 base::Bind(&DisableScenarioWhenIdle)); |
108 | 140 |
109 BackgroundTracingManager::GetInstance()->TriggerNamedEvent( | 141 BackgroundTracingManager::GetInstance()->TriggerNamedEvent( |
110 handle, base::Bind(&StartedFinalizingCallback, base::Closure(), true)); | 142 handle, base::Bind(&StartedFinalizingCallback, base::Closure(), true)); |
111 | 143 |
112 run_loop.Run(); | 144 run_loop.Run(); |
113 | 145 |
114 EXPECT_TRUE(upload_config_wrapper.get_receive_count() == 1); | 146 EXPECT_TRUE(upload_config_wrapper.get_receive_count() == 1); |
(...skipping 11 matching lines...) Expand all Loading... | |
126 run_loop.QuitClosure()); | 158 run_loop.QuitClosure()); |
127 | 159 |
128 scoped_ptr<BackgroundTracingPreemptiveConfig> config = | 160 scoped_ptr<BackgroundTracingPreemptiveConfig> config = |
129 CreatePreemptiveConfig(); | 161 CreatePreemptiveConfig(); |
130 | 162 |
131 content::BackgroundTracingManager::TriggerHandle handle = | 163 content::BackgroundTracingManager::TriggerHandle handle = |
132 content::BackgroundTracingManager::GetInstance()->RegisterTriggerType( | 164 content::BackgroundTracingManager::GetInstance()->RegisterTriggerType( |
133 "test"); | 165 "test"); |
134 | 166 |
135 BackgroundTracingManager::GetInstance()->SetActiveScenario( | 167 BackgroundTracingManager::GetInstance()->SetActiveScenario( |
136 config.Pass(), upload_config_wrapper.get_receive_callback(), true); | 168 config.Pass(), upload_config_wrapper.get_receive_callback(), |
169 base::Closure(), false); | |
137 | 170 |
138 BackgroundTracingManager::GetInstance()->WhenIdle( | 171 BackgroundTracingManager::GetInstance()->WhenIdle( |
139 base::Bind(&DisableScenarioWhenIdle)); | 172 base::Bind(&DisableScenarioWhenIdle)); |
140 | 173 |
141 BackgroundTracingManager::GetInstance()->TriggerNamedEvent( | 174 BackgroundTracingManager::GetInstance()->TriggerNamedEvent( |
142 handle, base::Bind(&StartedFinalizingCallback, base::Closure(), true)); | 175 handle, base::Bind(&StartedFinalizingCallback, base::Closure(), true)); |
143 BackgroundTracingManager::GetInstance()->TriggerNamedEvent( | 176 BackgroundTracingManager::GetInstance()->TriggerNamedEvent( |
144 handle, base::Bind(&StartedFinalizingCallback, base::Closure(), false)); | 177 handle, base::Bind(&StartedFinalizingCallback, base::Closure(), false)); |
145 | 178 |
146 run_loop.Run(); | 179 run_loop.Run(); |
147 | 180 |
148 EXPECT_TRUE(upload_config_wrapper.get_receive_count() == 1); | 181 EXPECT_TRUE(upload_config_wrapper.get_receive_count() == 1); |
149 } | 182 } |
150 } | 183 } |
151 | 184 |
185 namespace { | |
186 | |
187 bool IsTraceEventArgsWhitelisted(const char* category_group_name, | |
188 const char* event_name) { | |
189 if (MatchPattern(category_group_name, "benchmark") && | |
190 MatchPattern(event_name, "whitelisted")) { | |
191 return true; | |
192 } | |
193 | |
194 return false; | |
195 } | |
196 | |
197 } // namespace | |
198 | |
199 // This tests that non-whitelisted args get stripped if required. | |
200 IN_PROC_BROWSER_TEST_F(BackgroundTracingManagerBrowserTest, | |
201 NoWhitelistedArgsStripped) { | |
202 { | |
203 SetupBackgroundTracingManager(); | |
204 | |
205 base::trace_event::TraceLog::GetInstance()->SetArgumentFilterPredicate( | |
206 base::Bind(&IsTraceEventArgsWhitelisted)); | |
207 | |
208 base::RunLoop wait_for_upload; | |
209 BackgroundTracingManagerUploadConfigWrapper upload_config_wrapper( | |
210 wait_for_upload.QuitClosure()); | |
211 | |
212 scoped_ptr<BackgroundTracingPreemptiveConfig> config = | |
213 CreatePreemptiveConfig(); | |
214 | |
215 content::BackgroundTracingManager::TriggerHandle handle = | |
216 content::BackgroundTracingManager::GetInstance()->RegisterTriggerType( | |
217 "test"); | |
218 | |
219 base::RunLoop wait_for_activated; | |
220 BackgroundTracingManager::GetInstance()->SetActiveScenario( | |
221 config.Pass(), upload_config_wrapper.get_receive_callback(), | |
222 wait_for_activated.QuitClosure(), true); | |
223 | |
224 wait_for_activated.Run(); | |
225 | |
226 TRACE_EVENT1("benchmark", "whitelisted", "find_this", 1); | |
227 TRACE_EVENT1("benchmark", "not_whitelisted", "this_not_found", 1); | |
228 | |
229 BackgroundTracingManager::GetInstance()->WhenIdle( | |
230 base::Bind(&DisableScenarioWhenIdle)); | |
231 | |
232 BackgroundTracingManager::GetInstance()->TriggerNamedEvent( | |
233 handle, base::Bind(&StartedFinalizingCallback, base::Closure(), true)); | |
234 | |
235 wait_for_upload.Run(); | |
236 | |
237 EXPECT_TRUE(upload_config_wrapper.get_receive_count() == 1); | |
238 EXPECT_TRUE(upload_config_wrapper.TraceHasMatchingString("{")); | |
239 EXPECT_TRUE(upload_config_wrapper.TraceHasMatchingString("find_this")); | |
240 EXPECT_TRUE( | |
241 !upload_config_wrapper.TraceHasMatchingString("this_not_found")); | |
242 } | |
243 } | |
244 | |
245 // This tests subprocesses (like a navigating renderer) which gets told to | |
246 // provide a argument-filtered trace and has no predicate in place to do the | |
247 // filtering (in this case, only the browser process gets it set), will crash | |
248 // rather than return potential PII. | |
dsinclair
2015/06/01 15:09:37
We crash the process? That seems .... bad?
oystein (OOO til 10th of July)
2015/06/01 18:23:38
It's a CHECK() in the childprocess; shouldn't ever
| |
249 IN_PROC_BROWSER_TEST_F(BackgroundTracingManagerBrowserTest, | |
250 CrashWhenSubprocessWithoutArgumentFilter) { | |
251 { | |
252 SetupBackgroundTracingManager(); | |
253 | |
254 base::trace_event::TraceLog::GetInstance()->SetArgumentFilterPredicate( | |
255 base::Bind(&IsTraceEventArgsWhitelisted)); | |
256 | |
257 base::RunLoop wait_for_upload; | |
258 BackgroundTracingManagerUploadConfigWrapper upload_config_wrapper( | |
259 wait_for_upload.QuitClosure()); | |
260 | |
261 scoped_ptr<BackgroundTracingPreemptiveConfig> config = | |
262 CreatePreemptiveConfig(); | |
263 | |
264 content::BackgroundTracingManager::TriggerHandle handle = | |
265 content::BackgroundTracingManager::GetInstance()->RegisterTriggerType( | |
266 "test"); | |
267 | |
268 base::RunLoop wait_for_activated; | |
269 BackgroundTracingManager::GetInstance()->SetActiveScenario( | |
270 config.Pass(), upload_config_wrapper.get_receive_callback(), | |
271 wait_for_activated.QuitClosure(), true); | |
272 | |
273 wait_for_activated.Run(); | |
274 | |
275 NavigateToURL(shell(), GetTestUrl("", "about:blank")); | |
276 | |
277 BackgroundTracingManager::GetInstance()->WhenIdle( | |
278 base::Bind(&DisableScenarioWhenIdle)); | |
279 | |
280 BackgroundTracingManager::GetInstance()->TriggerNamedEvent( | |
281 handle, base::Bind(&StartedFinalizingCallback, base::Closure(), true)); | |
282 | |
283 wait_for_upload.Run(); | |
284 | |
285 EXPECT_TRUE(upload_config_wrapper.get_receive_count() == 1); | |
286 // We should *not* receive anything at all from the renderer, | |
287 // the process should've crashed rather than letting that happen. | |
288 EXPECT_TRUE( | |
289 !upload_config_wrapper.TraceHasMatchingString("CrRendererMain")); | |
290 } | |
291 } | |
292 | |
152 // This tests multiple triggers still only gathers once. | 293 // This tests multiple triggers still only gathers once. |
153 IN_PROC_BROWSER_TEST_F(BackgroundTracingManagerBrowserTest, | 294 IN_PROC_BROWSER_TEST_F(BackgroundTracingManagerBrowserTest, |
154 CallMultipleTriggersOnlyGatherOnce) { | 295 CallMultipleTriggersOnlyGatherOnce) { |
155 { | 296 { |
156 SetupBackgroundTracingManager(); | 297 SetupBackgroundTracingManager(); |
157 | 298 |
158 base::RunLoop run_loop; | 299 base::RunLoop run_loop; |
159 BackgroundTracingManagerUploadConfigWrapper upload_config_wrapper( | 300 BackgroundTracingManagerUploadConfigWrapper upload_config_wrapper( |
160 run_loop.QuitClosure()); | 301 run_loop.QuitClosure()); |
161 | 302 |
162 scoped_ptr<BackgroundTracingPreemptiveConfig> config = | 303 scoped_ptr<BackgroundTracingPreemptiveConfig> config = |
163 CreatePreemptiveConfig(); | 304 CreatePreemptiveConfig(); |
164 | 305 |
165 BackgroundTracingPreemptiveConfig::MonitoringRule rule; | 306 BackgroundTracingPreemptiveConfig::MonitoringRule rule; |
166 rule.type = | 307 rule.type = |
167 BackgroundTracingPreemptiveConfig::MONITOR_AND_DUMP_WHEN_TRIGGER_NAMED; | 308 BackgroundTracingPreemptiveConfig::MONITOR_AND_DUMP_WHEN_TRIGGER_NAMED; |
168 rule.named_trigger_info.trigger_name = "test1"; | 309 rule.named_trigger_info.trigger_name = "test1"; |
169 config->configs.push_back(rule); | 310 config->configs.push_back(rule); |
170 | 311 |
171 rule.named_trigger_info.trigger_name = "test2"; | 312 rule.named_trigger_info.trigger_name = "test2"; |
172 config->configs.push_back(rule); | 313 config->configs.push_back(rule); |
173 | 314 |
174 BackgroundTracingManager::TriggerHandle handle1 = | 315 BackgroundTracingManager::TriggerHandle handle1 = |
175 BackgroundTracingManager::GetInstance()->RegisterTriggerType("test1"); | 316 BackgroundTracingManager::GetInstance()->RegisterTriggerType("test1"); |
176 BackgroundTracingManager::TriggerHandle handle2 = | 317 BackgroundTracingManager::TriggerHandle handle2 = |
177 BackgroundTracingManager::GetInstance()->RegisterTriggerType("test2"); | 318 BackgroundTracingManager::GetInstance()->RegisterTriggerType("test2"); |
178 | 319 |
179 BackgroundTracingManager::GetInstance()->SetActiveScenario( | 320 BackgroundTracingManager::GetInstance()->SetActiveScenario( |
180 config.Pass(), upload_config_wrapper.get_receive_callback(), true); | 321 config.Pass(), upload_config_wrapper.get_receive_callback(), |
322 base::Closure(), false); | |
181 | 323 |
182 BackgroundTracingManager::GetInstance()->WhenIdle( | 324 BackgroundTracingManager::GetInstance()->WhenIdle( |
183 base::Bind(&DisableScenarioWhenIdle)); | 325 base::Bind(&DisableScenarioWhenIdle)); |
184 | 326 |
185 BackgroundTracingManager::GetInstance()->TriggerNamedEvent( | 327 BackgroundTracingManager::GetInstance()->TriggerNamedEvent( |
186 handle1, base::Bind(&StartedFinalizingCallback, base::Closure(), true)); | 328 handle1, base::Bind(&StartedFinalizingCallback, base::Closure(), true)); |
187 BackgroundTracingManager::GetInstance()->TriggerNamedEvent( | 329 BackgroundTracingManager::GetInstance()->TriggerNamedEvent( |
188 handle2, | 330 handle2, |
189 base::Bind(&StartedFinalizingCallback, base::Closure(), false)); | 331 base::Bind(&StartedFinalizingCallback, base::Closure(), false)); |
190 | 332 |
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
232 (base::Closure())); | 374 (base::Closure())); |
233 | 375 |
234 scoped_ptr<BackgroundTracingPreemptiveConfig> config = | 376 scoped_ptr<BackgroundTracingPreemptiveConfig> config = |
235 CreatePreemptiveConfig(); | 377 CreatePreemptiveConfig(); |
236 | 378 |
237 content::BackgroundTracingManager::TriggerHandle handle = | 379 content::BackgroundTracingManager::TriggerHandle handle = |
238 content::BackgroundTracingManager::GetInstance()->RegisterTriggerType( | 380 content::BackgroundTracingManager::GetInstance()->RegisterTriggerType( |
239 "does_not_exist"); | 381 "does_not_exist"); |
240 | 382 |
241 BackgroundTracingManager::GetInstance()->SetActiveScenario( | 383 BackgroundTracingManager::GetInstance()->SetActiveScenario( |
242 config.Pass(), upload_config_wrapper.get_receive_callback(), true); | 384 config.Pass(), upload_config_wrapper.get_receive_callback(), |
385 base::Closure(), false); | |
243 | 386 |
244 BackgroundTracingManager::GetInstance()->WhenIdle( | 387 BackgroundTracingManager::GetInstance()->WhenIdle( |
245 base::Bind(&DisableScenarioWhenIdle)); | 388 base::Bind(&DisableScenarioWhenIdle)); |
246 | 389 |
247 BackgroundTracingManager::GetInstance()->TriggerNamedEvent( | 390 BackgroundTracingManager::GetInstance()->TriggerNamedEvent( |
248 handle, | 391 handle, |
249 base::Bind(&StartedFinalizingCallback, run_loop.QuitClosure(), false)); | 392 base::Bind(&StartedFinalizingCallback, run_loop.QuitClosure(), false)); |
250 | 393 |
251 run_loop.Run(); | 394 run_loop.Run(); |
252 | 395 |
(...skipping 15 matching lines...) Expand all Loading... | |
268 CreatePreemptiveConfig(); | 411 CreatePreemptiveConfig(); |
269 | 412 |
270 content::BackgroundTracingManager::TriggerHandle handle = | 413 content::BackgroundTracingManager::TriggerHandle handle = |
271 content::BackgroundTracingManager::GetInstance()->RegisterTriggerType( | 414 content::BackgroundTracingManager::GetInstance()->RegisterTriggerType( |
272 "test"); | 415 "test"); |
273 | 416 |
274 content::BackgroundTracingManager::GetInstance() | 417 content::BackgroundTracingManager::GetInstance() |
275 ->InvalidateTriggerHandlesForTesting(); | 418 ->InvalidateTriggerHandlesForTesting(); |
276 | 419 |
277 BackgroundTracingManager::GetInstance()->SetActiveScenario( | 420 BackgroundTracingManager::GetInstance()->SetActiveScenario( |
278 config.Pass(), upload_config_wrapper.get_receive_callback(), true); | 421 config.Pass(), upload_config_wrapper.get_receive_callback(), |
422 base::Closure(), false); | |
279 | 423 |
280 BackgroundTracingManager::GetInstance()->WhenIdle( | 424 BackgroundTracingManager::GetInstance()->WhenIdle( |
281 base::Bind(&DisableScenarioWhenIdle)); | 425 base::Bind(&DisableScenarioWhenIdle)); |
282 | 426 |
283 BackgroundTracingManager::GetInstance()->TriggerNamedEvent( | 427 BackgroundTracingManager::GetInstance()->TriggerNamedEvent( |
284 handle, | 428 handle, |
285 base::Bind(&StartedFinalizingCallback, run_loop.QuitClosure(), false)); | 429 base::Bind(&StartedFinalizingCallback, run_loop.QuitClosure(), false)); |
286 | 430 |
287 run_loop.Run(); | 431 run_loop.Run(); |
288 | 432 |
(...skipping 14 matching lines...) Expand all Loading... | |
303 new content::BackgroundTracingPreemptiveConfig()); | 447 new content::BackgroundTracingPreemptiveConfig()); |
304 | 448 |
305 BackgroundTracingPreemptiveConfig::MonitoringRule rule; | 449 BackgroundTracingPreemptiveConfig::MonitoringRule rule; |
306 rule.type = BackgroundTracingPreemptiveConfig:: | 450 rule.type = BackgroundTracingPreemptiveConfig:: |
307 MONITOR_AND_DUMP_WHEN_SPECIFIC_HISTOGRAM_AND_VALUE; | 451 MONITOR_AND_DUMP_WHEN_SPECIFIC_HISTOGRAM_AND_VALUE; |
308 rule.histogram_trigger_info.histogram_name_to_trigger_on = "fake"; | 452 rule.histogram_trigger_info.histogram_name_to_trigger_on = "fake"; |
309 rule.histogram_trigger_info.histogram_bin_to_trigger_on = 0; | 453 rule.histogram_trigger_info.histogram_bin_to_trigger_on = 0; |
310 config->configs.push_back(rule); | 454 config->configs.push_back(rule); |
311 | 455 |
312 bool result = BackgroundTracingManager::GetInstance()->SetActiveScenario( | 456 bool result = BackgroundTracingManager::GetInstance()->SetActiveScenario( |
313 config.Pass(), upload_config_wrapper.get_receive_callback(), true); | 457 config.Pass(), upload_config_wrapper.get_receive_callback(), |
458 base::Closure(), false); | |
314 | 459 |
315 EXPECT_FALSE(result); | 460 EXPECT_FALSE(result); |
316 } | 461 } |
317 } | 462 } |
318 | 463 |
319 // This tests that reactive mode configs will fail. | 464 // This tests that reactive mode configs will fail. |
320 IN_PROC_BROWSER_TEST_F(BackgroundTracingManagerBrowserTest, | 465 IN_PROC_BROWSER_TEST_F(BackgroundTracingManagerBrowserTest, |
321 DoesNotAllowReactiveConfig) { | 466 DoesNotAllowReactiveConfig) { |
322 { | 467 { |
323 SetupBackgroundTracingManager(); | 468 SetupBackgroundTracingManager(); |
324 | 469 |
325 BackgroundTracingManagerUploadConfigWrapper upload_config_wrapper( | 470 BackgroundTracingManagerUploadConfigWrapper upload_config_wrapper( |
326 (base::Closure())); | 471 (base::Closure())); |
327 | 472 |
328 scoped_ptr<BackgroundTracingConfig> config( | 473 scoped_ptr<BackgroundTracingConfig> config( |
329 new BackgroundTracingReactiveConfig()); | 474 new BackgroundTracingReactiveConfig()); |
330 | 475 |
331 bool result = BackgroundTracingManager::GetInstance()->SetActiveScenario( | 476 bool result = BackgroundTracingManager::GetInstance()->SetActiveScenario( |
332 config.Pass(), upload_config_wrapper.get_receive_callback(), true); | 477 config.Pass(), upload_config_wrapper.get_receive_callback(), |
478 base::Closure(), false); | |
333 | 479 |
334 EXPECT_FALSE(result); | 480 EXPECT_FALSE(result); |
335 } | 481 } |
336 } | 482 } |
337 | 483 |
338 } // namespace content | 484 } // namespace content |
OLD | NEW |