OLD | NEW |
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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 "chrome/test/chromedriver/performance_logger.h" | 5 #include "chrome/test/chromedriver/performance_logger.h" |
6 | 6 |
7 #include <stddef.h> | 7 #include <stddef.h> |
8 | 8 |
9 #include <memory> | 9 #include <memory> |
10 #include <utility> | 10 #include <utility> |
(...skipping 314 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
325 FakeBrowserwideClient client; | 325 FakeBrowserwideClient client; |
326 FakeLog log; | 326 FakeLog log; |
327 Session session("test"); | 327 Session session("test"); |
328 PerfLoggingPrefs prefs; | 328 PerfLoggingPrefs prefs; |
329 prefs.trace_categories = "benchmark,blink.console"; | 329 prefs.trace_categories = "benchmark,blink.console"; |
330 PerformanceLogger logger(&log, &session, prefs); | 330 PerformanceLogger logger(&log, &session, prefs); |
331 | 331 |
332 client.AddListener(&logger); | 332 client.AddListener(&logger); |
333 logger.OnConnected(&client); | 333 logger.OnConnected(&client); |
334 base::DictionaryValue params; | 334 base::DictionaryValue params; |
335 base::ListValue* trace_events = new base::ListValue(); | 335 auto trace_events = base::MakeUnique<base::ListValue>(); |
336 std::unique_ptr<base::DictionaryValue> event1(new base::DictionaryValue()); | 336 auto event1 = base::MakeUnique<base::DictionaryValue>(); |
337 event1->SetString("cat", "foo"); | 337 event1->SetString("cat", "foo"); |
338 trace_events->Append(event1->CreateDeepCopy()); | 338 trace_events->GetList().push_back(*event1); |
339 std::unique_ptr<base::DictionaryValue> event2(new base::DictionaryValue()); | 339 auto event2 = base::MakeUnique<base::DictionaryValue>(); |
340 event2->SetString("cat", "bar"); | 340 event2->SetString("cat", "bar"); |
341 trace_events->Append(event2->CreateDeepCopy()); | 341 trace_events->GetList().push_back(*event2); |
342 params.Set("value", trace_events); | 342 params.Set("value", std::move(trace_events)); |
343 ASSERT_EQ(kOk, client.TriggerEvent("Tracing.dataCollected", params).code()); | 343 ASSERT_EQ(kOk, client.TriggerEvent("Tracing.dataCollected", params).code()); |
344 | 344 |
345 ASSERT_EQ(2u, log.GetEntries().size()); | 345 ASSERT_EQ(2u, log.GetEntries().size()); |
346 ValidateLogEntry(log.GetEntries()[0].get(), | 346 ValidateLogEntry(log.GetEntries()[0].get(), |
347 DevToolsClientImpl::kBrowserwideDevToolsClientId, | 347 DevToolsClientImpl::kBrowserwideDevToolsClientId, |
348 "Tracing.dataCollected", *event1); | 348 "Tracing.dataCollected", *event1); |
349 ValidateLogEntry(log.GetEntries()[1].get(), | 349 ValidateLogEntry(log.GetEntries()[1].get(), |
350 DevToolsClientImpl::kBrowserwideDevToolsClientId, | 350 DevToolsClientImpl::kBrowserwideDevToolsClientId, |
351 "Tracing.dataCollected", *event2); | 351 "Tracing.dataCollected", *event2); |
352 } | 352 } |
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
395 std::string webview; | 395 std::string webview; |
396 EXPECT_TRUE(message->GetString("webview", &webview)); | 396 EXPECT_TRUE(message->GetString("webview", &webview)); |
397 EXPECT_EQ(DevToolsClientImpl::kBrowserwideDevToolsClientId, webview); | 397 EXPECT_EQ(DevToolsClientImpl::kBrowserwideDevToolsClientId, webview); |
398 std::string method; | 398 std::string method; |
399 EXPECT_TRUE(message->GetString("message.method", &method)); | 399 EXPECT_TRUE(message->GetString("message.method", &method)); |
400 EXPECT_EQ("Tracing.bufferUsage", method); | 400 EXPECT_EQ("Tracing.bufferUsage", method); |
401 base::DictionaryValue* actual_params; | 401 base::DictionaryValue* actual_params; |
402 EXPECT_TRUE(message->GetDictionary("message.params", &actual_params)); | 402 EXPECT_TRUE(message->GetDictionary("message.params", &actual_params)); |
403 EXPECT_TRUE(actual_params->HasKey("error")); | 403 EXPECT_TRUE(actual_params->HasKey("error")); |
404 } | 404 } |
OLD | NEW |