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

media/cast/rtcp/sender_rtcp_event_subscriber.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 "media/cast/rtcp/sender_rtcp_event_subscriber.h"
 
 #include <utility>
 
-#include "base/single_thread_task_runner.h"
-#include "media/cast/cast_environment.h"
+#include "base/logging.h"
 #include "media/cast/rtcp/rtcp_defines.h"
 
 namespace media {
 namespace cast {
 
 SenderRtcpEventSubscriber::SenderRtcpEventSubscriber(
-    const scoped_refptr<base::SingleThreadTaskRunner>& main_thread_proxy,
     const size_t max_size_to_retain)
     : max_size_to_retain_(max_size_to_retain) {
-  DCHECK(main_thread_proxy->RunsTasksOnCurrentThread());
   DCHECK(max_size_to_retain_ > 0u);
 }
 
 SenderRtcpEventSubscriber::~SenderRtcpEventSubscriber() {
-  thread_checker_.CalledOnValidThread();
+  DCHECK(thread_checker_.CalledOnValidThread());
 }
 
 void SenderRtcpEventSubscriber::OnReceiveFrameEvent(
     const FrameEvent& frame_event) {
-  thread_checker_.CalledOnValidThread();
+  DCHECK(thread_checker_.CalledOnValidThread());
   if (frame_event.type != kVideoFrameCaptured &&
       frame_event.type != kVideoFrameSentToEncoder &&
       frame_event.type != kVideoFrameEncoded) {
     // Not interested in other events.
     return;
   }
 
   RtcpEventMap::iterator it = rtcp_events_.find(frame_event.rtp_timestamp);
   if (it == rtcp_events_.end()) {
     // We have not stored this frame (RTP timestamp) in our map.
@@ skipping 20 matching lines @@
 
     // Update existing entry.
     it->second.type = frame_event.type;
   }
 
   DCHECK(rtcp_events_.size() <= max_size_to_retain_);
 }
 
 void SenderRtcpEventSubscriber::OnReceivePacketEvent(
     const PacketEvent& packet_event) {
-  thread_checker_.CalledOnValidThread();
+  DCHECK(thread_checker_.CalledOnValidThread());
   // Do nothing as RTP sender is not interested in packet events for RTCP.
 }
 
 void SenderRtcpEventSubscriber::OnReceiveGenericEvent(
     const GenericEvent& generic_event) {
-  thread_checker_.CalledOnValidThread();
+  DCHECK(thread_checker_.CalledOnValidThread());
   // Do nothing as RTP sender is not interested in generic events for RTCP.
 }
 
 void SenderRtcpEventSubscriber::GetRtcpEventsAndReset(
     RtcpEventMap* rtcp_events) {
-  thread_checker_.CalledOnValidThread();
+  DCHECK(thread_checker_.CalledOnValidThread());
   rtcp_events->swap(rtcp_events_);
   rtcp_events_.clear();
 }
 
 void SenderRtcpEventSubscriber::TruncateMapIfNeeded() {
   // If map size has exceeded |max_size_to_retain_|, remove entry with
   // the smallest RTP timestamp.
   if (rtcp_events_.size() > max_size_to_retain_) {
     DVLOG(2) << "RTCP event map exceeded size limit; "
              << "removing oldest entry";
     // This is fine since we only insert elements one at a time.
     rtcp_events_.erase(rtcp_events_.begin());
   }
 }
 
 }  // namespace cast
 }  // namespace media