Revert of Deliver video frames on Android, on the decode thread.

webrtc/video_decoder.h

 /*
  *  Copyright (c) 2014 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 50 matching lines @@
 
   virtual int32_t InitDecode(const VideoCodec* codec_settings,
                              int32_t number_of_cores) = 0;
 
   virtual int32_t Decode(const EncodedImage& input_image,
                          bool missing_frames,
                          const RTPFragmentationHeader* fragmentation,
                          const CodecSpecificInfo* codec_specific_info = NULL,
                          int64_t render_time_ms = -1) = 0;
 
-#if defined(WEBRTC_ANDROID)
-  // This is a temporary remedy while the Android capture implementation is
-  // being changed to deliver frames on the decoder thread without polling.
-  // See https://bugs.chromium.org/p/webrtc/issues/detail?id=7361
-  virtual void PollDecodedFrames() {}
-#endif
-
   virtual int32_t RegisterDecodeCompleteCallback(
       DecodedImageCallback* callback) = 0;
 
   virtual int32_t Release() = 0;
 
   // Returns true if the decoder prefer to decode frames late.
   // That is, it can not decode infinite number of frames before the decoded
   // frame is consumed.
   virtual bool PrefersLateDecoding() const { return true; }
 
   virtual const char* ImplementationName() const { return "unknown"; }
 };
 
 }  // namespace webrtc
 
 #endif  // WEBRTC_VIDEO_DECODER_H_