diff options
| author | olli.raula <olli.raula@intel.com> | 2015-11-27 01:59:35 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-11-27 10:00:12 +0000 |
| commit | 73be357897b5496f6bfa8d5ddefbccfca24b7c62 (patch) | |
| tree | 41a725a2b48a95291c4b360a736abdeecb5adec3 /base/trace_event | |
| parent | aaa119fabc890ae2028abac5a9d125c8d6784428 (diff) | |
| download | chromium_src-73be357897b5496f6bfa8d5ddefbccfca24b7c62.zip chromium_src-73be357897b5496f6bfa8d5ddefbccfca24b7c62.tar.gz chromium_src-73be357897b5496f6bfa8d5ddefbccfca24b7c62.tar.bz2 | |
Remove ScopedVector from trace_log
BUG=554289
Review URL: https://codereview.chromium.org/1465433002
Cr-Commit-Position: refs/heads/master@{#361970}
Diffstat (limited to 'base/trace_event')
| -rw-r--r-- | base/trace_event/trace_log.cc | 2 | ||||
| -rw-r--r-- | base/trace_event/trace_log.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/base/trace_event/trace_log.cc b/base/trace_event/trace_log.cc index c8b28e3..791d9a2 100644 --- a/base/trace_event/trace_log.cc +++ b/base/trace_event/trace_log.cc @@ -1530,7 +1530,7 @@ void TraceLog::AddMetadataEventsWhileLocked() { lock_.AssertAcquired(); // Copy metadata added by |AddMetadataEvent| into the trace log. - for (TraceEvent* event : metadata_events_) + for (const scoped_ptr<TraceEvent>& event : metadata_events_) AddEventToThreadSharedChunkWhileLocked(nullptr, false)->CopyFrom(*event); #if !defined(OS_NACL) // NaCl shouldn't expose the process id. diff --git a/base/trace_event/trace_log.h b/base/trace_event/trace_log.h index eb52733..8aa7ff8 100644 --- a/base/trace_event/trace_log.h +++ b/base/trace_event/trace_log.h @@ -432,7 +432,7 @@ class BASE_EXPORT TraceLog : public MemoryDumpProvider { Mode mode_; int num_traces_recorded_; scoped_ptr<TraceBuffer> logged_events_; - ScopedVector<TraceEvent> metadata_events_; + std::vector<scoped_ptr<TraceEvent>> metadata_events_; subtle::AtomicWord /* EventCallback */ event_callback_; bool dispatching_to_observer_list_; std::vector<EnabledStateObserver*> enabled_state_observer_list_; |