Merging BaseSession code into WebRtcSession.

talk/session/media/currentspeakermonitor_unittest.cc

 /*
  * libjingle
  * Copyright 2004 Google Inc.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
  *
  *  1. Redistributions of source code must retain the above copyright notice,
  *     this list of conditions and the following disclaimer.
  *  2. Redistributions in binary form must reproduce the above copyright notice,
@@ skipping 28 matching lines @@
 // actually require more or less time between switches than that specified
 // in the call to set_min_time_between_switches.  To be safe, we sleep for
 // 90 ms more than the min time between switches before checking for a switch.
 // I am assuming system clocks do not have a coarser resolution than 90 ms.
 static const uint32_t kSleepTimeBetweenSwitches = 100;
 
 class CurrentSpeakerMonitorTest : public testing::Test,
     public sigslot::has_slots<> {
  public:
   CurrentSpeakerMonitorTest() {
-    monitor_ = new CurrentSpeakerMonitor(&source_, NULL);
+    monitor_ = new CurrentSpeakerMonitor(&source_);
     // Shrink the minimum time betweeen switches to 10 ms so we don't have to
     // slow down our tests.
     monitor_->set_min_time_between_switches(kMinTimeBetweenSwitches);
     monitor_->SignalUpdate.connect(this, &CurrentSpeakerMonitorTest::OnUpdate);
     current_speaker_ = 0;
     num_changes_ = 0;
     monitor_->Start();
   }
 
   ~CurrentSpeakerMonitorTest() {
@@ skipping 157 matching lines @@
   info.active_streams.push_back(std::make_pair(kSsrc1, 3));
   info.active_streams.push_back(std::make_pair(kSsrc2, 0));
   SignalAudioMonitor(info);
 
   // At this point, we should have concluded that SSRC2 stopped speaking.
   EXPECT_EQ(current_speaker_, kSsrc1);
   EXPECT_EQ(num_changes_, 2);
 }
 
 }  // namespace cricket