Index: components/tracing/trace_config_file.cc |
diff --git a/components/tracing/trace_config_file.cc b/components/tracing/trace_config_file.cc |
index a19b66f51512dfb38e3b9dbf3b36a2d321b1aa6d..f6a852edd5ebaf41889a01ed4733d95cbb0ea5a6 100644 |
--- a/components/tracing/trace_config_file.cc |
+++ b/components/tracing/trace_config_file.cc |
@@ -6,13 +6,13 @@ |
#include <stddef.h> |
+#include <memory> |
#include <string> |
#include "base/command_line.h" |
#include "base/files/file_util.h" |
#include "base/json/json_reader.h" |
#include "base/logging.h" |
-#include "base/memory/scoped_ptr.h" |
#include "base/memory/singleton.h" |
#include "base/values.h" |
#include "build/build_config.h" |
@@ -97,11 +97,11 @@ TraceConfigFile::~TraceConfigFile() { |
} |
bool TraceConfigFile::ParseTraceConfigFileContent(const std::string& content) { |
- scoped_ptr<base::Value> value(base::JSONReader::Read(content)); |
+ std::unique_ptr<base::Value> value(base::JSONReader::Read(content)); |
if (!value || !value->IsType(base::Value::TYPE_DICTIONARY)) |
return false; |
- scoped_ptr<base::DictionaryValue> dict( |
+ std::unique_ptr<base::DictionaryValue> dict( |
static_cast<base::DictionaryValue*>(value.release())); |
base::DictionaryValue* trace_config_dict = NULL; |