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

media/cast/logging/logging_raw_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/scoped_ptr.h"
-#include "base/test/simple_test_tick_clock.h"
 #include "media/cast/logging/logging_defines.h"
 #include "media/cast/logging/logging_raw.h"
 #include "media/cast/logging/simple_event_subscriber.h"
-#include "media/cast/test/fake_single_thread_task_runner.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace media {
 namespace cast {
 
 class LoggingRawTest : public ::testing::Test {
  protected:
-  LoggingRawTest()
-      : task_runner_(new test::FakeSingleThreadTaskRunner(&testing_clock_)),
-        event_subscriber_(task_runner_) {
+  LoggingRawTest() {
     raw_.AddSubscriber(&event_subscriber_);
   }
 
   virtual ~LoggingRawTest() { raw_.RemoveSubscriber(&event_subscriber_); }
 
   LoggingRaw raw_;
-  base::SimpleTestTickClock testing_clock_;
-  scoped_refptr<test::FakeSingleThreadTaskRunner> task_runner_;
   SimpleEventSubscriber event_subscriber_;
   std::vector<FrameEvent> frame_events_;
   std::vector<PacketEvent> packet_events_;
   std::vector<GenericEvent> generic_events_;
 };
 
 TEST_F(LoggingRawTest, FrameEvent) {
   CastLoggingEvent event_type = kVideoFrameDecoded;
   uint32 frame_id = 456u;
   RtpTimestamp rtp_timestamp = 123u;
@@ skipping 107 matching lines @@
   EXPECT_TRUE(packet_events_.empty());
 
   event_subscriber_.GetGenericEventsAndReset(&generic_events_);
   ASSERT_EQ(1u, generic_events_.size());
   EXPECT_EQ(event_type, generic_events_[0].type);
   EXPECT_EQ(value, generic_events_[0].value);
   EXPECT_EQ(timestamp, generic_events_[0].timestamp);
 }
 
 TEST_F(LoggingRawTest, MultipleSubscribers) {
-  SimpleEventSubscriber event_subscriber_2(task_runner_);
+  SimpleEventSubscriber event_subscriber_2;
 
   // Now raw_ has two subscribers.
   raw_.AddSubscriber(&event_subscriber_2);
 
   CastLoggingEvent event_type = kVideoFrameDecoded;
   uint32 frame_id = 456u;
   RtpTimestamp rtp_timestamp = 123u;
   base::TimeTicks timestamp = base::TimeTicks();
   raw_.InsertFrameEvent(timestamp, event_type, rtp_timestamp, frame_id);
 
@@ skipping 45 matching lines @@
   EXPECT_EQ(timestamp, frame_events_[0].timestamp);
   EXPECT_EQ(event_type, frame_events_[0].type);
   EXPECT_EQ(base::TimeDelta(), frame_events_[0].delay_delta);
 
   event_subscriber_2.GetFrameEventsAndReset(&frame_events_);
   EXPECT_TRUE(frame_events_.empty());
 }
 
 }  // namespace cast
 }  // namespace media