Move DTMF sender to RtpSender (as opposed to WebRtcSession).

webrtc/pc/dtmfsender_unittest.cc

 /*
  *  Copyright 2012 The WebRTC project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
@@ skipping 60 matching lines @@
     int gap;
   };
 
   FakeDtmfProvider() : last_insert_dtmf_call_(0) {}
 
   ~FakeDtmfProvider() {
     SignalDestroyed();
   }
 
   // Implements DtmfProviderInterface.
-  bool CanInsertDtmf(const std::string& track_label) override {
-    return (can_insert_dtmf_tracks_.count(track_label) != 0);
-  }
+  bool CanInsertDtmf() override { return can_insert_; }
 
-  bool InsertDtmf(const std::string& track_label,
-                  int code,
-                  int duration) override {
+  bool InsertDtmf(int code, int duration) override {
     int gap = 0;
     // TODO(ronghuawu): Make the timer (basically the rtc::TimeNanos)
     // mockable and use a fake timer in the unit tests.
     if (last_insert_dtmf_call_ > 0) {
       gap = static_cast<int>(rtc::TimeMillis() - last_insert_dtmf_call_);
     }
     last_insert_dtmf_call_ = rtc::TimeMillis();
 
     LOG(LS_VERBOSE) << "FakeDtmfProvider::InsertDtmf code=" << code
                     << " duration=" << duration
                     << " gap=" << gap << ".";
     dtmf_info_queue_.push_back(DtmfInfo(code, duration, gap));
     return true;
   }
 
   sigslot::signal0<>* GetOnDestroyedSignal() override {
     return &SignalDestroyed;
   }
 
   // getter and setter
   const std::vector<DtmfInfo>& dtmf_info_queue() const {
     return dtmf_info_queue_;
   }
 
   // helper functions
-  void AddCanInsertDtmfTrack(const std::string& label) {
-    can_insert_dtmf_tracks_.insert(label);
-  }
-  void RemoveCanInsertDtmfTrack(const std::string& label) {
-    can_insert_dtmf_tracks_.erase(label);
-  }
+  void SetCanInsertDtmf(bool can_insert) { can_insert_ = can_insert; }
 
  private:
-  std::set<std::string> can_insert_dtmf_tracks_;
+  bool can_insert_ = false;
   std::vector<DtmfInfo> dtmf_info_queue_;
   int64_t last_insert_dtmf_call_;
   sigslot::signal0<> SignalDestroyed;
 };
 
 class DtmfSenderTest : public testing::Test {
  protected:
   DtmfSenderTest()
       : track_(AudioTrack::Create(kTestAudioLabel, NULL)),
         observer_(new rtc::RefCountedObject<FakeDtmfObserver>()),
         provider_(new FakeDtmfProvider()) {
-    provider_->AddCanInsertDtmfTrack(kTestAudioLabel);
+    provider_->SetCanInsertDtmf(true);
     dtmf_ = DtmfSender::Create(track_, rtc::Thread::Current(),
                                provider_.get());
     dtmf_->RegisterObserver(observer_.get());
   }
 
   ~DtmfSenderTest() {
     if (dtmf_.get()) {
       dtmf_->UnregisterObserver();
     }
   }
@@ skipping 76 matching lines @@
 
   rtc::scoped_refptr<AudioTrackInterface> track_;
   std::unique_ptr<FakeDtmfObserver> observer_;
   std::unique_ptr<FakeDtmfProvider> provider_;
   rtc::scoped_refptr<DtmfSender> dtmf_;
   rtc::ScopedFakeClock fake_clock_;
 };
 
 TEST_F(DtmfSenderTest, CanInsertDtmf) {
   EXPECT_TRUE(dtmf_->CanInsertDtmf());
-  provider_->RemoveCanInsertDtmfTrack(kTestAudioLabel);
+  provider_->SetCanInsertDtmf(false);
   EXPECT_FALSE(dtmf_->CanInsertDtmf());
 }
 
 TEST_F(DtmfSenderTest, InsertDtmf) {
   std::string tones = "@1%a&*$";
   int duration = 100;
   int inter_tone_gap = 50;
   EXPECT_TRUE(dtmf_->InsertDtmf(tones, duration, inter_tone_gap));
   EXPECT_TRUE_SIMULATED_WAIT(observer_->completed(), kMaxWaitMs, fake_clock_);
 
@@ skipping 85 matching lines @@
   EXPECT_TRUE_SIMULATED_WAIT(observer_->completed(), kMaxWaitMs, fake_clock_);
 
   VerifyOnProvider(tones, duration, inter_tone_gap);
   VerifyOnObserver(tones);
 }
 
 TEST_F(DtmfSenderTest, TryInsertDtmfWhenItDoesNotWork) {
   std::string tones = "3,4";
   int duration = 100;
   int inter_tone_gap = 50;
-  provider_->RemoveCanInsertDtmfTrack(kTestAudioLabel);
+  provider_->SetCanInsertDtmf(false);
   EXPECT_FALSE(dtmf_->InsertDtmf(tones, duration, inter_tone_gap));
 }
 
 TEST_F(DtmfSenderTest, InsertDtmfWithInvalidDurationOrGap) {
   std::string tones = "3,4";
   int duration = 100;
   int inter_tone_gap = 50;
 
   EXPECT_FALSE(dtmf_->InsertDtmf(tones, 6001, inter_tone_gap));
   EXPECT_FALSE(dtmf_->InsertDtmf(tones, 69, inter_tone_gap));
   EXPECT_FALSE(dtmf_->InsertDtmf(tones, duration, 49));
 
   EXPECT_TRUE(dtmf_->InsertDtmf(tones, duration, inter_tone_gap));
 }