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

media/cast/rtcp/receiver_rtcp_event_subscriber.h

 // 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.
 
 #ifndef MEDIA_CAST_RTCP_RECEIVER_RTCP_EVENT_SUBSCRIBER_H_
 #define MEDIA_CAST_RTCP_RECEIVER_RTCP_EVENT_SUBSCRIBER_H_
 
 #include <map>
 
-#include "base/memory/ref_counted.h"
 #include "base/threading/thread_checker.h"
 #include "media/cast/logging/logging_defines.h"
 #include "media/cast/logging/raw_event_subscriber.h"
 #include "media/cast/rtcp/rtcp_defines.h"
 
 namespace base {
-
 class SingleThreadTaskRunner;
 }
 
 namespace media {
 namespace cast {
 
 // A RawEventSubscriber implementation with the following properties:
 // - Only processes raw event types that are relevant for sending from cast
 //   receiver to cast sender via RTCP.
 // - Captures information to be sent over to RTCP from raw event logs into the
 //   more compact RtcpEvent struct.
 // - Orders events by RTP timestamp with a multimap.
 // - Internally, the map is capped at a maximum size configurable by the caller.
 //   The subscriber only keeps the most recent events (determined by RTP
 //   timestamp) up to the size limit.
 class ReceiverRtcpEventSubscriber : public RawEventSubscriber {
  public:
   // Identifies whether the subscriber will process audio or video related
   // frame events.
   enum Type {
     kAudioEventSubscriber,  // Only processes audio events
     kVideoEventSubscriber   // Only processes video events
   };
 
-  // |main_thread_proxy|: Check that the object is created in main thread.
-  // This object does not hold a reference on it.
   // |max_size_to_retain|: The object will keep up to |max_size_to_retain|
   // events
   // in the map. Once threshold has been reached, an event with the smallest
   // RTP timestamp will be removed.
   // |type|: Determines whether the subscriber will process only audio or video
   // events.
-  ReceiverRtcpEventSubscriber(
-      const scoped_refptr<base::SingleThreadTaskRunner>& main_thread_proxy,
-      const size_t max_size_to_retain, Type type);
+  ReceiverRtcpEventSubscriber(const size_t max_size_to_retain, Type type);
 
   virtual ~ReceiverRtcpEventSubscriber();
 
   // RawEventSubscriber implementation.
   virtual void OnReceiveFrameEvent(const FrameEvent& frame_event) OVERRIDE;
   virtual void OnReceivePacketEvent(const PacketEvent& packet_event) OVERRIDE;
   virtual void OnReceiveGenericEvent(const GenericEvent& generic_event)
       OVERRIDE;
 
   // Converts all collected events since last invocation into
@@ skipping 22 matching lines @@
   // Ensures methods are only called on the main thread.
   base::ThreadChecker thread_checker_;
 
   DISALLOW_COPY_AND_ASSIGN(ReceiverRtcpEventSubscriber);
 };
 
 }  // namespace cast
 }  // namespace media
 
 #endif  // MEDIA_CAST_RTCP_RECEIVER_RTCP_EVENT_SUBSCRIBER_H_