Cast: Added missing DCHECKs to ThreadChecker calls and minor cleanup.

media/cast/rtcp/receiver_rtcp_event_subscriber_unittest.cc

 // Copyright 2014 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 "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/test/simple_test_tick_clock.h"
 #include "base/time/tick_clock.h"
 #include "media/cast/cast_environment.h"
 #include "media/cast/logging/logging_defines.h"
 #include "media/cast/rtcp/receiver_rtcp_event_subscriber.h"
 #include "media/cast/test/fake_single_thread_task_runner.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace media {
 namespace cast {
 
 namespace {
 
-const size_t kSizeThreshold = 10u;
+const size_t kMaxEventEntries = 10u;
 const int64 kDelayMs = 20L;
 
 }  // namespace
 
 class ReceiverRtcpEventSubscriberTest : public ::testing::Test {
  protected:
   ReceiverRtcpEventSubscriberTest()
       : testing_clock_(new base::SimpleTestTickClock()),
         task_runner_(new test::FakeSingleThreadTaskRunner(testing_clock_)),
         cast_environment_(new CastEnvironment(
             scoped_ptr<base::TickClock>(testing_clock_).Pass(), task_runner_,
             task_runner_, task_runner_, task_runner_, task_runner_,
             task_runner_, GetLoggingConfigWithRawEventsAndStatsEnabled())) {}
 
   virtual ~ReceiverRtcpEventSubscriberTest() {}
 
   virtual void TearDown() OVERRIDE {
     if (event_subscriber_) {
       cast_environment_->Logging()->RemoveRawEventSubscriber(
           event_subscriber_.get());
     }
   }
 
   void Init(ReceiverRtcpEventSubscriber::Type type) {
     event_subscriber_.reset(
-        new ReceiverRtcpEventSubscriber(task_runner_, kSizeThreshold, type));
+        new ReceiverRtcpEventSubscriber(kMaxEventEntries, type));
     cast_environment_->Logging()->AddRawEventSubscriber(
         event_subscriber_.get());
   }
 
   void InsertEvents() {
     // Video events
     cast_environment_->Logging()->InsertFrameEventWithDelay(
         testing_clock_->NowTicks(), kVideoRenderDelay, /*rtp_timestamp*/ 100u,
         /*frame_id*/ 2u, base::TimeDelta::FromMilliseconds(kDelayMs));
     cast_environment_->Logging()->InsertFrameEvent(
@@ skipping 119 matching lines @@
   event_subscriber_->GetReceiverLogMessageAndReset(&receiver_log);
 
   // Event with RTP timestamp 10 should have been dropped when 110 is inserted.
   ASSERT_EQ(10u, receiver_log.size());
   EXPECT_EQ(20u, receiver_log.begin()->rtp_timestamp_);
   EXPECT_EQ(110u, receiver_log.rbegin()->rtp_timestamp_);
 }
 
 }  // namespace cast
 }  // namespace media