| Index: base/test/trace_event_analyzer.h
|
| diff --git a/base/test/trace_event_analyzer.h b/base/test/trace_event_analyzer.h
|
| index 8087ec5cd8b9daf3eb8e3fcb5fc9918ca73fb3db..0e2366bbb19c8e89b2bc91526dc4e2f013e47907 100644
|
| --- a/base/test/trace_event_analyzer.h
|
| +++ b/base/test/trace_event_analyzer.h
|
| @@ -135,7 +135,7 @@ struct TraceEvent {
|
| bool GetArgAsNumber(const std::string& name, double* arg) const;
|
| // Return the argument value if it exists.
|
| bool GetArgAsValue(const std::string& name,
|
| - scoped_ptr<base::Value>* arg) const;
|
| + std::unique_ptr<base::Value>* arg) const;
|
|
|
| // Check if argument exists and is string.
|
| bool HasStringArg(const std::string& name) const;
|
| @@ -151,7 +151,8 @@ struct TraceEvent {
|
| double GetKnownArgAsDouble(const std::string& name) const;
|
| int GetKnownArgAsInt(const std::string& name) const;
|
| bool GetKnownArgAsBool(const std::string& name) const;
|
| - scoped_ptr<base::Value> GetKnownArgAsValue(const std::string& name) const;
|
| + std::unique_ptr<base::Value> GetKnownArgAsValue(
|
| + const std::string& name) const;
|
|
|
| // Process ID and Thread ID.
|
| ProcessThreadID thread;
|
| @@ -169,7 +170,7 @@ struct TraceEvent {
|
| // bool becomes 1.0 (true) or 0.0 (false).
|
| std::map<std::string, double> arg_numbers;
|
| std::map<std::string, std::string> arg_strings;
|
| - std::map<std::string, scoped_ptr<base::Value>> arg_values;
|
| + std::map<std::string, std::unique_ptr<base::Value>> arg_values;
|
|
|
| // The other event associated with this event (or NULL).
|
| const TraceEvent* other_event;
|
|
|