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

Unified Diff: content/browser/devtools/protocol/tracing_handler.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/devtools/protocol/tracing_handler.cc
diff --git a/content/browser/devtools/protocol/tracing_handler.cc b/content/browser/devtools/protocol/tracing_handler.cc
index e7de4c753ce05c7a1166eaa8a1889d8db75ad7fa..59cbfc9e0a1c099b81c5d409cba3bdb8bcd4a20b 100644
--- a/content/browser/devtools/protocol/tracing_handler.cc
+++ b/content/browser/devtools/protocol/tracing_handler.cc
@@ -48,10 +48,11 @@ std::string ConvertFromCamelCase(const std::string& in_str, char separator) {
return out_str;
}
-scoped_ptr<base::Value> ConvertDictKeyStyle(const base::Value& value) {
+std::unique_ptr<base::Value> ConvertDictKeyStyle(const base::Value& value) {
const base::DictionaryValue* dict = nullptr;
if (value.GetAsDictionary(&dict)) {
- scoped_ptr<base::DictionaryValue> out_dict(new base::DictionaryValue());
+ std::unique_ptr<base::DictionaryValue> out_dict(
+ new base::DictionaryValue());
for (base::DictionaryValue::Iterator it(*dict); !it.IsAtEnd();
it.Advance()) {
out_dict->Set(ConvertFromCamelCase(it.key(), '_'),
@@ -62,7 +63,7 @@ scoped_ptr<base::Value> ConvertDictKeyStyle(const base::Value& value) {
const base::ListValue* list = nullptr;
if (value.GetAsList(&list)) {
- scoped_ptr<base::ListValue> out_list(new base::ListValue());
+ std::unique_ptr<base::ListValue> out_list(new base::ListValue());
for (const auto& value : *list)
out_list->Append(ConvertDictKeyStyle(*value));
return std::move(out_list);
@@ -141,7 +142,7 @@ TracingHandler::TracingHandler(TracingHandler::Target target,
TracingHandler::~TracingHandler() {
}
-void TracingHandler::SetClient(scoped_ptr<Client> client) {
+void TracingHandler::SetClient(std::unique_ptr<Client> client) {
client_.swap(client);
}
@@ -177,7 +178,7 @@ Response TracingHandler::Start(
const std::string* options,
const double* buffer_usage_reporting_interval,
const std::string* transfer_mode,
- const scoped_ptr<base::DictionaryValue>& config) {
+ const std::unique_ptr<base::DictionaryValue>& config) {
if (IsTracing())
return Response::InternalError("Tracing is already started");
@@ -339,9 +340,9 @@ bool TracingHandler::IsStartupTracingActive() {
// static
base::trace_event::TraceConfig TracingHandler::GetTraceConfigFromDevToolsConfig(
const base::DictionaryValue& devtools_config) {
- scoped_ptr<base::Value> value = ConvertDictKeyStyle(devtools_config);
+ std::unique_ptr<base::Value> value = ConvertDictKeyStyle(devtools_config);
DCHECK(value && value->IsType(base::Value::TYPE_DICTIONARY));
- scoped_ptr<base::DictionaryValue> tracing_dict(
+ std::unique_ptr<base::DictionaryValue> tracing_dict(
static_cast<base::DictionaryValue*>(value.release()));
std::string mode;
« no previous file with comments | « content/browser/devtools/protocol/tracing_handler.h ('k') | content/browser/devtools/protocol/tracing_handler_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698