diff options
author | danakj <danakj@chromium.org> | 2015-03-09 18:48:05 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2015-03-10 01:49:09 +0000 |
commit | 9fdfd058a7df48c29dd254d8a6a02c8f7c8d31a1 (patch) | |
tree | b3f08c944501b814fc79152ace1877bdc375dd5d /base/trace_event/trace_event_impl.cc | |
parent | 535b4f0be7b7edde9874e8b6ac1519afe44f6db5 (diff) | |
download | chromium_src-9fdfd058a7df48c29dd254d8a6a02c8f7c8d31a1.zip chromium_src-9fdfd058a7df48c29dd254d8a6a02c8f7c8d31a1.tar.gz chromium_src-9fdfd058a7df48c29dd254d8a6a02c8f7c8d31a1.tar.bz2 |
base: Stop passing by non-const references in some more places.
These are mostly unit test changes. There are a fair number of
occurances still, but they are not easy (or possible) to change due
to STL, third_party, or template requirements.
R=Nico
BUG=464816
Review URL: https://codereview.chromium.org/992083002
Cr-Commit-Position: refs/heads/master@{#319812}
Diffstat (limited to 'base/trace_event/trace_event_impl.cc')
-rw-r--r-- | base/trace_event/trace_event_impl.cc | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/base/trace_event/trace_event_impl.cc b/base/trace_event/trace_event_impl.cc index bd0b57d..72b46f9 100644 --- a/base/trace_event/trace_event_impl.cc +++ b/base/trace_event/trace_event_impl.cc @@ -430,25 +430,22 @@ scoped_ptr<TraceBufferChunk> TraceBufferChunk::Clone() const { // and unlocks at the end of scope if locked. class TraceLog::OptionalAutoLock { public: - explicit OptionalAutoLock(Lock& lock) - : lock_(lock), - locked_(false) { - } + explicit OptionalAutoLock(Lock* lock) : lock_(lock), locked_(false) {} ~OptionalAutoLock() { if (locked_) - lock_.Release(); + lock_->Release(); } void EnsureAcquired() { if (!locked_) { - lock_.Acquire(); + lock_->Acquire(); locked_ = true; } } private: - Lock& lock_; + Lock* lock_; bool locked_; DISALLOW_COPY_AND_ASSIGN(OptionalAutoLock); }; @@ -1977,7 +1974,7 @@ TraceEventHandle TraceLog::AddTraceEventWithThreadIdAndTimestamp( std::string console_message; if (*category_group_enabled & (ENABLED_FOR_RECORDING | ENABLED_FOR_MONITORING)) { - OptionalAutoLock lock(lock_); + OptionalAutoLock lock(&lock_); TraceEvent* trace_event = NULL; if (thread_local_event_buffer) { @@ -2130,7 +2127,7 @@ void TraceLog::UpdateTraceEventDuration( std::string console_message; if (*category_group_enabled & ENABLED_FOR_RECORDING) { - OptionalAutoLock lock(lock_); + OptionalAutoLock lock(&lock_); TraceEvent* trace_event = GetEventByHandleInternal(handle, &lock); if (trace_event) { |