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

Unified Diff: content/browser/tracing/tracing_controller_impl.cc

Issue 1874893002: Convert //content/browser from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 8 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 side-by-side diff with in-line comments
Download patch
Index: content/browser/tracing/tracing_controller_impl.cc
diff --git a/content/browser/tracing/tracing_controller_impl.cc b/content/browser/tracing/tracing_controller_impl.cc
index 06ef7c8f04bb84ba2a6b3fb6f268a1004cf51b05..aba7a7546dc97f9f0d66627a830e52cb316d8555 100644
--- a/content/browser/tracing/tracing_controller_impl.cc
+++ b/content/browser/tracing/tracing_controller_impl.cc
@@ -108,8 +108,9 @@ std::string GetClockString() {
return std::string();
}
-scoped_ptr<base::DictionaryValue> GenerateTracingMetadataDict() {
- scoped_ptr<base::DictionaryValue> metadata_dict(new base::DictionaryValue());
+std::unique_ptr<base::DictionaryValue> GenerateTracingMetadataDict() {
+ std::unique_ptr<base::DictionaryValue> metadata_dict(
+ new base::DictionaryValue());
metadata_dict->SetString("network-type", GetNetworkTypeString());
metadata_dict->SetString("product-version", GetContentClient()->GetProduct());
@@ -158,7 +159,7 @@ scoped_ptr<base::DictionaryValue> GenerateTracingMetadataDict() {
metadata_dict->SetString("gpu-gl-renderer", gpu_info.gl_renderer);
#endif
- scoped_ptr<TracingDelegate> delegate(
+ std::unique_ptr<TracingDelegate> delegate(
GetContentClient()->browser()->GetTracingDelegate());
if (delegate)
delegate->GenerateMetadataDict(metadata_dict.get());
@@ -348,7 +349,7 @@ bool TracingControllerImpl::StopTracing(
if (trace_data_sink) {
if (TraceLog::GetInstance()->GetCurrentTraceConfig()
.IsArgumentFilterEnabled()) {
- scoped_ptr<TracingDelegate> delegate(
+ std::unique_ptr<TracingDelegate> delegate(
GetContentClient()->browser()->GetTracingDelegate());
if (delegate) {
trace_data_sink->SetMetadataFilterPredicate(
« no previous file with comments | « content/browser/tracing/tracing_controller_impl.h ('k') | content/browser/tracing/tracing_controller_impl_data_sinks.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698