summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoretienneb@chromium.org <etienneb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-02-20 13:39:01 +0000
committeretienneb@chromium.org <etienneb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-02-20 13:39:01 +0000
commit1d6f7770997a62a23d4bbabe2a2c1363900960a6 (patch)
tree0a23965b5f3d0b0dfed6ac7eeda1ae676911bfbc
parentd39a81039e80fd6abed400411f4343189d1597e7 (diff)
downloadchromium_src-1d6f7770997a62a23d4bbabe2a2c1363900960a6.zip
chromium_src-1d6f7770997a62a23d4bbabe2a2c1363900960a6.tar.gz
chromium_src-1d6f7770997a62a23d4bbabe2a2c1363900960a6.tar.bz2
Fix some typo and nits while reading the code.
Removed from this CL: https://codereview.chromium.org/171143002/ R=cpu, dsinclair BUG= Review URL: https://codereview.chromium.org/172563003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@252222 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--base/debug/trace_event_impl.cc7
-rw-r--r--base/win/event_trace_consumer.h2
-rw-r--r--base/win/event_trace_consumer_unittest.cc2
-rw-r--r--base/win/event_trace_controller.cc2
4 files changed, 6 insertions, 7 deletions
diff --git a/base/debug/trace_event_impl.cc b/base/debug/trace_event_impl.cc
index ce25c38..3823e52 100644
--- a/base/debug/trace_event_impl.cc
+++ b/base/debug/trace_event_impl.cc
@@ -1319,12 +1319,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);
@@ -1955,8 +1955,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
diff --git a/base/win/event_trace_consumer.h b/base/win/event_trace_consumer.h
index c1b42b4..9322e1e 100644
--- a/base/win/event_trace_consumer.h
+++ b/base/win/event_trace_consumer.h
@@ -16,7 +16,7 @@ namespace base {
namespace win {
// This class is a base class that makes it easier to consume events
-// from realtime or file sessions. Concrete consumers need to sublass
+// from realtime or file sessions. Concrete consumers need to subclass
// a specialization of this class and override the ProcessEvent and/or
// the ProcessBuffer methods to implement the event consumption logic.
// Usage might look like:
diff --git a/base/win/event_trace_consumer_unittest.cc b/base/win/event_trace_consumer_unittest.cc
index d238192..e46f564 100644
--- a/base/win/event_trace_consumer_unittest.cc
+++ b/base/win/event_trace_consumer_unittest.cc
@@ -94,7 +94,7 @@ class EtwTraceConsumerBaseTest: public testing::Test {
}
virtual void TearDown() {
- // Cleanup any potentially danging sessions.
+ // Cleanup any potentially dangling sessions.
EtwTraceProperties ignore;
EtwTraceController::Stop(session_name_.c_str(), &ignore);
}
diff --git a/base/win/event_trace_controller.cc b/base/win/event_trace_controller.cc
index 0391fbc..9a35a6b 100644
--- a/base/win/event_trace_controller.cc
+++ b/base/win/event_trace_controller.cc
@@ -64,7 +64,7 @@ HRESULT EtwTraceController::Start(const wchar_t* session_name,
}
HRESULT EtwTraceController::StartFileSession(const wchar_t* session_name,
- const wchar_t* logfile_path, bool realtime) {
+ const wchar_t* logfile_path, bool realtime) {
DCHECK(NULL == session_ && session_name_.empty());
EtwTraceProperties prop;