Merge "Timing logger clean-up" into dalvik-dev

2 files changed, 4 insertions, 4 deletions

diff --git a/runtime/base/timing_logger.cc b/runtime/base/timing_logger.cc
index 78a6883..1dcad0e 100644
--- a/runtime/base/timing_logger.cc
+++ b/runtime/base/timing_logger.cc
@@ -243,7 +243,7 @@ TimingLogger::ScopedSplit::~ScopedSplit() {
 
   timing_logger_->current_split_ = enclosing_split_;
   if (enclosing_split_ != NULL) {
-    enclosing_split_->UnPause();
+    enclosing_split_->Resume();
   }
 }
 
@@ -281,7 +281,7 @@ void TimingLogger::ScopedSplit::Pause() {
 }
 
 
-void TimingLogger::ScopedSplit::UnPause() {
+void TimingLogger::ScopedSplit::Resume() {
   uint64_t current_time = NanoTime();
 
   start_ns_ = current_time;
diff --git a/runtime/base/timing_logger.h b/runtime/base/timing_logger.h
index 8649a96..777d3f0 100644
--- a/runtime/base/timing_logger.h
+++ b/runtime/base/timing_logger.h
@@ -107,8 +107,8 @@ class TimingLogger {
       // Pauses timing of the split, usually due to nesting of another split.
       void Pause();
 
-      // Unpauses timing of the split, usually because a nested split has ended.
-      void UnPause();
+      // Resumes timing of the split, usually because a nested split has ended.
+      void Resume();
 
       // Used by new split to swap splits in place in a ScopedSplit instance.
       void TailInsertSplit(const char* label);