From a973f953863608dab7ac82b35df08cac499a2b0f Mon Sep 17 00:00:00 2001
From: sakal <sakal@webrtc.org>
Date: Sat, 3 Sep 2016 10:29:07 -0700
Subject: [PATCH] Remove restart method from VideoTrackSourceInterface.

This method is no longer needed.

Review-Url: https://codereview.webrtc.org/2306013002
Cr-Commit-Position: refs/heads/master@{#14060}
---
 webrtc/api/androidvideotracksource.h          |  3 ---
 webrtc/api/mediastreaminterface.h             |  1 -
 webrtc/api/videocapturertracksource.cc        | 13 ----------
 webrtc/api/videocapturertracksource.h         |  1 -
 .../api/videocapturertracksource_unittest.cc  | 24 -------------------
 webrtc/api/videosourceproxy.h                 |  1 -
 webrtc/api/videotracksource.h                 |  1 -
 7 files changed, 44 deletions(-)

diff --git a/webrtc/api/androidvideotracksource.h b/webrtc/api/androidvideotracksource.h
index a615b26b06..79d0df2b0b 100644
--- a/webrtc/api/androidvideotracksource.h
+++ b/webrtc/api/androidvideotracksource.h
@@ -37,9 +37,6 @@ class AndroidVideoTrackSource : public Notifier<VideoTrackSourceInterface> {
   // Not used on Android.
   // TODO(sakal/magjed): Try to remove this from the interface.
   void Stop() override { RTC_NOTREACHED(); };
-  // Not used on Android.
-  // TODO(sakal/magjed): Try to remove this from the interface.
-  void Restart() override { RTC_NOTREACHED(); }
 
   bool is_screencast() const override { return is_screencast_; }
 
diff --git a/webrtc/api/mediastreaminterface.h b/webrtc/api/mediastreaminterface.h
index f64d0006eb..33d5e5f2c5 100644
--- a/webrtc/api/mediastreaminterface.h
+++ b/webrtc/api/mediastreaminterface.h
@@ -107,7 +107,6 @@ class VideoTrackSourceInterface
   };
 
   virtual void Stop() = 0;
-  virtual void Restart() = 0;
 
   // Indicates that parameters suitable for screencasts should be automatically
   // applied to RtpSenders.
diff --git a/webrtc/api/videocapturertracksource.cc b/webrtc/api/videocapturertracksource.cc
index 2bef1431de..1bf4bea1d0 100644
--- a/webrtc/api/videocapturertracksource.cc
+++ b/webrtc/api/videocapturertracksource.cc
@@ -376,19 +376,6 @@ void VideoCapturerTrackSource::Stop() {
       rtc::Bind(&cricket::VideoCapturer::Stop, video_capturer_.get()));
 }
 
-void VideoCapturerTrackSource::Restart() {
-  if (started_) {
-    return;
-  }
-  if (!worker_thread_->Invoke<bool>(
-          RTC_FROM_HERE, rtc::Bind(&cricket::VideoCapturer::StartCapturing,
-                                   video_capturer_.get(), format_))) {
-    SetState(kEnded);
-    return;
-  }
-  started_ = true;
-}
-
 // OnStateChange listens to the cricket::VideoCapturer::SignalStateChange.
 void VideoCapturerTrackSource::OnStateChange(
     cricket::VideoCapturer* capturer,
diff --git a/webrtc/api/videocapturertracksource.h b/webrtc/api/videocapturertracksource.h
index 92f00dc4e5..e7bbfd2287 100644
--- a/webrtc/api/videocapturertracksource.h
+++ b/webrtc/api/videocapturertracksource.h
@@ -58,7 +58,6 @@ class VideoCapturerTrackSource : public VideoTrackSource,
   bool GetStats(Stats* stats) override;
 
   void Stop() override;
-  void Restart() override;
 
  protected:
   VideoCapturerTrackSource(rtc::Thread* worker_thread,
diff --git a/webrtc/api/videocapturertracksource_unittest.cc b/webrtc/api/videocapturertracksource_unittest.cc
index 90d2cd2563..607188c044 100644
--- a/webrtc/api/videocapturertracksource_unittest.cc
+++ b/webrtc/api/videocapturertracksource_unittest.cc
@@ -157,30 +157,6 @@ TEST_F(VideoCapturerTrackSourceTest, CapturerStartStop) {
                  kMaxWaitMs);
 }
 
-// Test that a VideoSource can be stopped and restarted.
-TEST_F(VideoCapturerTrackSourceTest, StopRestart) {
-  // Initialize without constraints.
-  CreateVideoCapturerSource();
-  EXPECT_EQ_WAIT(MediaSourceInterface::kLive, state_observer_->state(),
-                 kMaxWaitMs);
-
-  ASSERT_TRUE(capturer_->CaptureFrame());
-  EXPECT_EQ(1, renderer_.num_rendered_frames());
-
-  source_->Stop();
-  EXPECT_EQ_WAIT(MediaSourceInterface::kEnded, state_observer_->state(),
-                 kMaxWaitMs);
-
-  source_->Restart();
-  EXPECT_EQ_WAIT(MediaSourceInterface::kLive, state_observer_->state(),
-                 kMaxWaitMs);
-
-  ASSERT_TRUE(capturer_->CaptureFrame());
-  EXPECT_EQ(2, renderer_.num_rendered_frames());
-
-  source_->Stop();
-}
-
 // Test that a VideoSource transition to kEnded if the capture device
 // fails.
 TEST_F(VideoCapturerTrackSourceTest, CameraFailed) {
diff --git a/webrtc/api/videosourceproxy.h b/webrtc/api/videosourceproxy.h
index 6d4dfcb805..40f81dc690 100644
--- a/webrtc/api/videosourceproxy.h
+++ b/webrtc/api/videosourceproxy.h
@@ -24,7 +24,6 @@ BEGIN_PROXY_MAP(VideoTrackSource)
   PROXY_CONSTMETHOD0(SourceState, state)
   PROXY_CONSTMETHOD0(bool, remote)
   PROXY_METHOD0(void, Stop)
-  PROXY_METHOD0(void, Restart)
   PROXY_CONSTMETHOD0(bool, is_screencast)
   PROXY_CONSTMETHOD0(rtc::Optional<bool>, needs_denoising)
   PROXY_METHOD1(bool, GetStats, Stats*)
diff --git a/webrtc/api/videotracksource.h b/webrtc/api/videotracksource.h
index 10e24ab27e..1d1d579d61 100644
--- a/webrtc/api/videotracksource.h
+++ b/webrtc/api/videotracksource.h
@@ -34,7 +34,6 @@ class VideoTrackSource : public Notifier<VideoTrackSourceInterface> {
   bool remote() const override { return remote_; }
 
   void Stop() override{};
-  void Restart() override{};
 
   bool is_screencast() const override { return false; }
   rtc::Optional<bool> needs_denoising() const override {