| Index: base/trace_event/trace_event_impl.cc
|
| diff --git a/base/trace_event/trace_event_impl.cc b/base/trace_event/trace_event_impl.cc
|
| index 34bbb2882e8be46d08111c65eb186b2f0ec22375..f61bc29158358a4d57f8e43ed47798536dbbbaa0 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) {
|
|
|