| Index: base/debug/trace_event_impl.cc
|
| diff --git a/base/debug/trace_event_impl.cc b/base/debug/trace_event_impl.cc
|
| index f5e3ec6fcb13802f5f510a91eac9bd178e3daf38..b6fcce710db1dd1579f215307a3415a2a812530b 100644
|
| --- a/base/debug/trace_event_impl.cc
|
| +++ b/base/debug/trace_event_impl.cc
|
| @@ -1316,12 +1316,12 @@ void TraceLog::SetEnabled(const CategoryFilter& category_filter,
|
|
|
| if (IsEnabled()) {
|
| if (options != old_options) {
|
| - DLOG(ERROR) << "Attemting to re-enable tracing with a different "
|
| + DLOG(ERROR) << "Attempting to re-enable tracing with a different "
|
| << "set of options.";
|
| }
|
|
|
| if (mode != mode_) {
|
| - DLOG(ERROR) << "Attemting to re-enable tracing with a different mode.";
|
| + DLOG(ERROR) << "Attempting to re-enable tracing with a different mode.";
|
| }
|
|
|
| category_filter_.Merge(category_filter);
|
| @@ -1952,8 +1952,7 @@ void TraceLog::AddTraceEventEtw(char phase,
|
| void TraceLog::AddTraceEventEtw(char phase,
|
| const char* name,
|
| const void* id,
|
| - const std::string& extra)
|
| -{
|
| + const std::string& extra) {
|
| #if defined(OS_WIN)
|
| TraceEventETWProvider::Trace(name, phase, id, extra);
|
| #endif
|
|
|