Add unit tests for sub-components of CaptureScheduler.

remoting/base/rate_counter.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "remoting/base/rate_counter.h"
 
+#include "base/logging.h"

[alexeypa (please no reviews), 2013/03/18 19:39:39]

Is this header actually used?

[Wez, 2013/03/19 23:23:14]

No; used it during development. It's needed for the suggested CHECKs, though.

+
 namespace remoting {
 
 RateCounter::RateCounter(base::TimeDelta time_window)
     : time_window_(time_window),
       sum_(0) {
 }

[alexeypa (please no reviews), 2013/03/18 19:39:39]

nit: Add CHECK(time_window_.InMilliseconds() > 0)

[Wez, 2013/03/19 23:23:14]

Done.

 
 RateCounter::~RateCounter() {
 }
 
 void RateCounter::Record(int64 value) {
-  base::Time current_time = base::Time::Now();
-  Evict(current_time);
+  base::Time current_time = CurrentTime();
 
   base::AutoLock auto_lock(lock_);
+  EvictOldDataPoints(current_time);
   sum_ += value;
   data_points_.push(std::make_pair(current_time, value));
 }
 
 double RateCounter::Rate() {
-  Evict(base::Time::Now());
+  base::Time current_time = CurrentTime();

[alexeypa (please no reviews), 2013/03/18 19:39:39]

Should CurrentTime() be called under the lock?

[Wez, 2013/03/19 23:23:14]

No, I don't think so.  This way it captures the time at which the call was made.

 
   base::AutoLock auto_lock(lock_);
+  EvictOldDataPoints(current_time);
   return static_cast<double>(base::Time::kMillisecondsPerSecond) * sum_ /

[alexeypa (please no reviews), 2013/03/18 19:39:39]

nit: Since it is converting to double anyway it will be shorter if you write it
as:

return static_cast<double>(sum_) / time_window_.InSecondsF();

Or even:

return sum_ / time_window_.InSecondsF();

[Wez, 2013/03/19 23:23:14]

Done.

       time_window_.InMilliseconds();
 }
 
-void RateCounter::Evict(base::Time current_time) {
-  base::AutoLock auto_lock(lock_);
+void RateCounter::SetCurrentTimeForTest(base::Time current_time) {
+  current_time_for_test_ = current_time;
+}
+
+void RateCounter::EvictOldDataPoints(base::Time current_time) {
+  lock_.AssertAcquired();
 
   // Remove data points outside of the window.
   base::Time window_start = current_time - time_window_;
 
   while (!data_points_.empty()) {
     if (data_points_.front().first > window_start)
       break;
 
     sum_ -= data_points_.front().second;
     data_points_.pop();
   }
 }
 
+base::Time RateCounter::CurrentTime() const {
+  if (current_time_for_test_ == base::Time())
+    return base::Time::Now();
+  return current_time_for_test_;
+}
+
 }  // namespace remoting