Reland Remove unused cricket::VideoCapturer methods. Originally reviewed and landed as patchset #2 …

webrtc/api/videosource.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.
  */
 
 #include "webrtc/api/videosource.h"
 
 #include <cstdlib>
+#include <string>
 #include <vector>
 
 #include "webrtc/api/mediaconstraintsinterface.h"
 #include "webrtc/base/arraysize.h"
 #include "webrtc/pc/channelmanager.h"
 
 using cricket::CaptureState;
 using webrtc::MediaConstraintsInterface;
 using webrtc::MediaSourceInterface;
 
@@ skipping 24 matching lines @@
 };
 
 MediaSourceInterface::SourceState
 GetReadyState(cricket::CaptureState state) {
   switch (state) {
     case cricket::CS_STARTING:
       return MediaSourceInterface::kInitializing;
     case cricket::CS_RUNNING:
       return MediaSourceInterface::kLive;
     case cricket::CS_FAILED:
-    case cricket::CS_NO_DEVICE:
     case cricket::CS_STOPPED:
       return MediaSourceInterface::kEnded;
     case cricket::CS_PAUSED:
       return MediaSourceInterface::kMuted;
     default:
       ASSERT(false && "GetReadyState unknown state");
   }
   return MediaSourceInterface::kEnded;
 }
 
@@ skipping 327 matching lines @@
 void VideoSource::RemoveSink(
     rtc::VideoSinkInterface<cricket::VideoFrame>* output) {
   sinks_.remove(output);
   channel_manager_->RemoveVideoSink(video_capturer_.get(), output);
 }
 
 // OnStateChange listens to the ChannelManager::SignalVideoCaptureStateChange.
 // This signal is triggered for all video capturers. Not only the one we are
 // interested in.
 void VideoSource::OnStateChange(cricket::VideoCapturer* capturer,
-                                     cricket::CaptureState capture_state) {
+                                cricket::CaptureState capture_state) {
   if (capturer == video_capturer_.get()) {
     SetState(GetReadyState(capture_state));
   }
 }
 
 void VideoSource::SetState(SourceState new_state) {
   // TODO(hbos): Temporarily disabled VERIFY due to webrtc:4776.
   // if (VERIFY(state_ != new_state)) {
   if (state_ != new_state) {
     state_ = new_state;
     FireOnChanged();
   }
 }
 
 }  // namespace webrtc