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

media/cast/rtcp/receiver_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/receiver_rtcp_event_subscriber.h"
 
 #include <utility>
 
-#include "base/single_thread_task_runner.h"
-#include "media/cast/cast_environment.h"
-
 namespace media {
 namespace cast {
 
 ReceiverRtcpEventSubscriber::ReceiverRtcpEventSubscriber(
-    const scoped_refptr<base::SingleThreadTaskRunner>& main_thread_proxy,
     const size_t max_size_to_retain, Type type)
     : max_size_to_retain_(max_size_to_retain), type_(type) {
-  DCHECK(main_thread_proxy->RunsTasksOnCurrentThread());
   DCHECK(max_size_to_retain_ > 0u);
   DCHECK(type_ == kAudioEventSubscriber || type_ == kVideoEventSubscriber);
 }
 
 ReceiverRtcpEventSubscriber::~ReceiverRtcpEventSubscriber() {
-  thread_checker_.CalledOnValidThread();
+  DCHECK(thread_checker_.CalledOnValidThread());
 }
 
 void ReceiverRtcpEventSubscriber::OnReceiveFrameEvent(
     const FrameEvent& frame_event) {
-  thread_checker_.CalledOnValidThread();
+  DCHECK(thread_checker_.CalledOnValidThread());
 
   if (ShouldProcessEvent(frame_event.type)) {
     RtcpEvent rtcp_event;
     switch (frame_event.type) {
       case kAudioPlayoutDelay:
       case kVideoRenderDelay:
         rtcp_event.delay_delta = frame_event.delay_delta;
       case kAudioFrameDecoded:
       case kVideoFrameDecoded:
       // TODO(imcheng): This doesn't seem correct because kAudioAckSent and
@@ skipping 11 matching lines @@
     }
   }
 
   TruncateMapIfNeeded();
 
   DCHECK(rtcp_events_.size() <= max_size_to_retain_);
 }
 
 void ReceiverRtcpEventSubscriber::OnReceivePacketEvent(
     const PacketEvent& packet_event) {
-  thread_checker_.CalledOnValidThread();
+  DCHECK(thread_checker_.CalledOnValidThread());
 
   if (ShouldProcessEvent(packet_event.type)) {
     RtcpEvent rtcp_event;
     if (packet_event.type == kAudioPacketReceived ||
         packet_event.type == kVideoPacketReceived) {
       rtcp_event.type = packet_event.type;
       rtcp_event.timestamp = packet_event.timestamp;
       rtcp_event.packet_id = packet_event.packet_id;
       rtcp_events_.insert(
           std::make_pair(packet_event.rtp_timestamp, rtcp_event));
     }
   }
 
   TruncateMapIfNeeded();
 
   DCHECK(rtcp_events_.size() <= max_size_to_retain_);
 }
 
 void ReceiverRtcpEventSubscriber::OnReceiveGenericEvent(
     const GenericEvent& generic_event) {
-  thread_checker_.CalledOnValidThread();
+  DCHECK(thread_checker_.CalledOnValidThread());
   // Do nothing as RTP receiver is not interested in generic events for RTCP.
 }
 
 void ReceiverRtcpEventSubscriber::GetReceiverLogMessageAndReset(
     RtcpReceiverLogMessage* receiver_log) {
-  thread_checker_.CalledOnValidThread();
+  DCHECK(thread_checker_.CalledOnValidThread());
 
   receiver_log->clear();
 
   typedef std::multimap<RtpTimestamp, RtcpEvent> RtcpEventMultiMap;
   RtcpEventMultiMap::const_iterator it = rtcp_events_.begin();
   while (it != rtcp_events_.end()) {
     // On each iteration, process all entries that have the same key (RTP
     // timestamp) within the multimap, and generate a
     // RtcpReceiverFrameLogMessage from them.
     RtpTimestamp rtp_timestamp = it->first;
@@ skipping 35 matching lines @@
     return event_type == kVideoRenderDelay ||
            event_type == kVideoFrameDecoded || event_type == kVideoAckSent ||
            event_type == kVideoPacketReceived;
   } else {
     return false;
   }
 }
 
 }  // namespace cast
 }  // namespace media