diff options
author | estade <estade@chromium.org> | 2015-05-15 18:02:34 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2015-05-16 01:02:46 +0000 |
commit | 8d04646294767ea1f3a7da596547b465d50cb4d1 (patch) | |
tree | 6bd6194b6fe2ac226114f9125570bd605e9b6d42 /content/browser/tracing/tracing_ui.cc | |
parent | f39e5aff5aae8451a7ef190a2fc822bf80c4e30d (diff) | |
download | chromium_src-8d04646294767ea1f3a7da596547b465d50cb4d1.zip chromium_src-8d04646294767ea1f3a7da596547b465d50cb4d1.tar.gz chromium_src-8d04646294767ea1f3a7da596547b465d50cb4d1.tar.bz2 |
Convert JsonWriter::Write to taking a const ref for the in-param
Clearer API; flushes out a lot of unnecessary heap allocations.
depends on https://codereview.chromium.org/1129083003/
BUG=none
Review URL: https://codereview.chromium.org/1131113004
Cr-Commit-Position: refs/heads/master@{#330255}
Diffstat (limited to 'content/browser/tracing/tracing_ui.cc')
-rw-r--r-- | content/browser/tracing/tracing_ui.cc | 29 |
1 files changed, 14 insertions, 15 deletions
diff --git a/content/browser/tracing/tracing_ui.cc b/content/browser/tracing/tracing_ui.cc index 58fbb75..546fd74 100644 --- a/content/browser/tracing/tracing_ui.cc +++ b/content/browser/tracing/tracing_ui.cc @@ -40,14 +40,14 @@ namespace { void OnGotCategories(const WebUIDataSource::GotDataCallback& callback, const std::set<std::string>& categorySet) { - scoped_ptr<base::ListValue> category_list(new base::ListValue()); + base::ListValue category_list; for (std::set<std::string>::const_iterator it = categorySet.begin(); it != categorySet.end(); it++) { - category_list->AppendString(*it); + category_list.AppendString(*it); } base::RefCountedString* res = new base::RefCountedString(); - base::JSONWriter::Write(category_list.get(), &res->data()); + base::JSONWriter::Write(category_list, &res->data()); callback.Run(res); } @@ -133,12 +133,12 @@ void OnTraceBufferUsageResult(const WebUIDataSource::GotDataCallback& callback, void OnTraceBufferStatusResult(const WebUIDataSource::GotDataCallback& callback, float percent_full, size_t approximate_event_count) { - scoped_ptr<base::DictionaryValue> status(new base::DictionaryValue()); - status->SetDouble("percentFull", percent_full); - status->SetInteger("approximateEventCount", approximate_event_count); + base::DictionaryValue status; + status.SetDouble("percentFull", percent_full); + status.SetInteger("approximateEventCount", approximate_event_count); std::string status_json; - base::JSONWriter::Write(status.get(), &status_json); + base::JSONWriter::Write(status, &status_json); base::RefCountedString* status_base64 = new base::RefCountedString(); base::Base64Encode(status_json, &status_base64->data()); @@ -177,18 +177,17 @@ void GetMonitoringStatus(const WebUIDataSource::GotDataCallback& callback) { TracingController::GetInstance()->GetMonitoringStatus( &is_monitoring, &category_filter, &options); - scoped_ptr<base::DictionaryValue> - monitoring_options(new base::DictionaryValue()); - monitoring_options->SetBoolean("isMonitoring", is_monitoring); - monitoring_options->SetString("categoryFilter", category_filter.ToString()); - monitoring_options->SetBoolean("useSystemTracing", options.enable_systrace); - monitoring_options->SetBoolean( + base::DictionaryValue monitoring_options; + monitoring_options.SetBoolean("isMonitoring", is_monitoring); + monitoring_options.SetString("categoryFilter", category_filter.ToString()); + monitoring_options.SetBoolean("useSystemTracing", options.enable_systrace); + monitoring_options.SetBoolean( "useContinuousTracing", options.record_mode == base::trace_event::RECORD_CONTINUOUSLY); - monitoring_options->SetBoolean("useSampling", options.enable_sampling); + monitoring_options.SetBoolean("useSampling", options.enable_sampling); std::string monitoring_options_json; - base::JSONWriter::Write(monitoring_options.get(), &monitoring_options_json); + base::JSONWriter::Write(monitoring_options, &monitoring_options_json); base::RefCountedString* monitoring_options_base64 = new base::RefCountedString(); |