| Index: base/trace_event/trace_log.h
|
| diff --git a/base/trace_event/trace_log.h b/base/trace_event/trace_log.h
|
| index 67477c43f22f430dac1776f53af1f38d76e87a92..3f09674829381f30825e9ceea2734b0cf7111fc9 100644
|
| --- a/base/trace_event/trace_log.h
|
| +++ b/base/trace_event/trace_log.h
|
| @@ -8,6 +8,7 @@
|
| #include <stddef.h>
|
| #include <stdint.h>
|
|
|
| +#include <memory>
|
| #include <string>
|
| #include <vector>
|
|
|
| @@ -15,7 +16,6 @@
|
| #include "base/containers/hash_tables.h"
|
| #include "base/gtest_prod_util.h"
|
| #include "base/macros.h"
|
| -#include "base/memory/scoped_ptr.h"
|
| #include "base/memory/scoped_vector.h"
|
| #include "base/trace_event/memory_dump_provider.h"
|
| #include "base/trace_event/trace_config.h"
|
| @@ -191,7 +191,7 @@ class BASE_EXPORT TraceLog : public MemoryDumpProvider {
|
| const char** arg_names,
|
| const unsigned char* arg_types,
|
| const unsigned long long* arg_values,
|
| - scoped_ptr<ConvertableToTraceFormat>* convertable_values,
|
| + std::unique_ptr<ConvertableToTraceFormat>* convertable_values,
|
| unsigned int flags);
|
| TraceEventHandle AddTraceEventWithBindId(
|
| char phase,
|
| @@ -204,7 +204,7 @@ class BASE_EXPORT TraceLog : public MemoryDumpProvider {
|
| const char** arg_names,
|
| const unsigned char* arg_types,
|
| const unsigned long long* arg_values,
|
| - scoped_ptr<ConvertableToTraceFormat>* convertable_values,
|
| + std::unique_ptr<ConvertableToTraceFormat>* convertable_values,
|
| unsigned int flags);
|
| TraceEventHandle AddTraceEventWithProcessId(
|
| char phase,
|
| @@ -217,7 +217,7 @@ class BASE_EXPORT TraceLog : public MemoryDumpProvider {
|
| const char** arg_names,
|
| const unsigned char* arg_types,
|
| const unsigned long long* arg_values,
|
| - scoped_ptr<ConvertableToTraceFormat>* convertable_values,
|
| + std::unique_ptr<ConvertableToTraceFormat>* convertable_values,
|
| unsigned int flags);
|
| TraceEventHandle AddTraceEventWithThreadIdAndTimestamp(
|
| char phase,
|
| @@ -231,7 +231,7 @@ class BASE_EXPORT TraceLog : public MemoryDumpProvider {
|
| const char** arg_names,
|
| const unsigned char* arg_types,
|
| const unsigned long long* arg_values,
|
| - scoped_ptr<ConvertableToTraceFormat>* convertable_values,
|
| + std::unique_ptr<ConvertableToTraceFormat>* convertable_values,
|
| unsigned int flags);
|
| TraceEventHandle AddTraceEventWithThreadIdAndTimestamp(
|
| char phase,
|
| @@ -246,7 +246,7 @@ class BASE_EXPORT TraceLog : public MemoryDumpProvider {
|
| const char** arg_names,
|
| const unsigned char* arg_types,
|
| const unsigned long long* arg_values,
|
| - scoped_ptr<ConvertableToTraceFormat>* convertable_values,
|
| + std::unique_ptr<ConvertableToTraceFormat>* convertable_values,
|
| unsigned int flags);
|
|
|
| // Adds a metadata event that will be written when the trace log is flushed.
|
| @@ -257,7 +257,7 @@ class BASE_EXPORT TraceLog : public MemoryDumpProvider {
|
| const char** arg_names,
|
| const unsigned char* arg_types,
|
| const unsigned long long* arg_values,
|
| - scoped_ptr<ConvertableToTraceFormat>* convertable_values,
|
| + std::unique_ptr<ConvertableToTraceFormat>* convertable_values,
|
| unsigned int flags);
|
|
|
| void UpdateTraceEventDuration(const unsigned char* category_group_enabled,
|
| @@ -400,7 +400,7 @@ class BASE_EXPORT TraceLog : public MemoryDumpProvider {
|
| void FlushCurrentThread(int generation, bool discard_events);
|
| // Usually it runs on a different thread.
|
| static void ConvertTraceEventsToTraceFormat(
|
| - scoped_ptr<TraceBuffer> logged_events,
|
| + std::unique_ptr<TraceBuffer> logged_events,
|
| const TraceLog::OutputCallback& flush_output_callback,
|
| const ArgumentFilterPredicate& argument_filter_predicate);
|
| void FinishFlush(int generation, bool discard_events);
|
| @@ -437,8 +437,8 @@ class BASE_EXPORT TraceLog : public MemoryDumpProvider {
|
| Lock thread_info_lock_;
|
| Mode mode_;
|
| int num_traces_recorded_;
|
| - scoped_ptr<TraceBuffer> logged_events_;
|
| - std::vector<scoped_ptr<TraceEvent>> metadata_events_;
|
| + std::unique_ptr<TraceBuffer> logged_events_;
|
| + std::vector<std::unique_ptr<TraceEvent>> metadata_events_;
|
| subtle::AtomicWord /* EventCallback */ event_callback_;
|
| bool dispatching_to_observer_list_;
|
| std::vector<EnabledStateObserver*> enabled_state_observer_list_;
|
| @@ -470,7 +470,7 @@ class BASE_EXPORT TraceLog : public MemoryDumpProvider {
|
| subtle::AtomicWord /* Options */ trace_options_;
|
|
|
| // Sampling thread handles.
|
| - scoped_ptr<TraceSamplingThread> sampling_thread_;
|
| + std::unique_ptr<TraceSamplingThread> sampling_thread_;
|
| PlatformThreadHandle sampling_thread_handle_;
|
|
|
| TraceConfig trace_config_;
|
| @@ -487,7 +487,7 @@ class BASE_EXPORT TraceLog : public MemoryDumpProvider {
|
|
|
| // For events which can't be added into the thread local buffer, e.g. events
|
| // from threads without a message loop.
|
| - scoped_ptr<TraceBufferChunk> thread_shared_chunk_;
|
| + std::unique_ptr<TraceBufferChunk> thread_shared_chunk_;
|
| size_t thread_shared_chunk_index_;
|
|
|
| // Set when asynchronous Flush is in progress.
|
|
|