Move direct use of VideoCapturer::VideoAdapter to VideoSinkWants.

webrtc/media/base/videocapturer.h

 /*
  *  Copyright (c) 2010 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 228 matching lines @@
                    sigslot::multi_threaded_local> SignalFrameCaptured;
 
   // If true, run video adaptation. By default, video adaptation is enabled
   // and users must call video_adapter()->OnOutputFormatRequest()
   // to receive frames.
   bool enable_video_adapter() const { return enable_video_adapter_; }
   void set_enable_video_adapter(bool enable_video_adapter) {
     enable_video_adapter_ = enable_video_adapter;
   }
 
-  CoordinatedVideoAdapter* video_adapter() { return &video_adapter_; }
-  const CoordinatedVideoAdapter* video_adapter() const {
-    return &video_adapter_;
-  }
-
   // Takes ownership.
   void set_frame_factory(VideoFrameFactory* frame_factory);
 
   // Gets statistics for tracked variables recorded since the last call to
   // GetStats.  Note that calling GetStats resets any gathered data so it
   // should be called only periodically to log statistics.
   void GetStats(VariableInfo<int>* adapt_drop_stats,
                 VariableInfo<int>* effect_drop_stats,
                 VariableInfo<double>* frame_time_stats,
                 VideoFormat* last_captured_frame_format);
@@ skipping 15 matching lines @@
   virtual void OnSinkWantsChanged(const rtc::VideoSinkWants& wants);
 
   // Callback attached to SignalFrameCaptured where SignalVideoFrames is called.
   void OnFrameCaptured(VideoCapturer* video_capturer,
                        const CapturedFrame* captured_frame);
 
   // Callback attached to SignalVideoFrame.
   // TODO(perkj): Remove once SignalVideoFrame is removed.
   void OnFrame(VideoCapturer* capturer, const VideoFrame* frame);
 
+  CoordinatedVideoAdapter* video_adapter() { return &video_adapter_; }
+
   void SetCaptureState(CaptureState state);
 
   // Marshals SignalStateChange onto thread_.
   void OnMessage(rtc::Message* message) override;
 
   // subclasses override this virtual method to provide a vector of fourccs, in
   // order of preference, that are expected by the media engine.
   virtual bool GetPreferredFourccs(std::vector<uint32_t>* fourccs) = 0;
 
   // mutators to set private attributes
@@ skipping 74 matching lines @@
 
   // Whether capturer should apply rotation to the frame before signaling it.
   bool apply_rotation_;
 
   RTC_DISALLOW_COPY_AND_ASSIGN(VideoCapturer);
 };
 
 }  // namespace cricket
 
 #endif  // WEBRTC_MEDIA_BASE_VIDEOCAPTURER_H_