Roll WebRTC 9354:9381, Libjingle 9354:9381

content/renderer/media/webrtc/webrtc_video_frame_adapter.h

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CONTENT_RENDERER_MEDIA_WEBRTC_WEBRTC_VIDEO_FRAME_ADAPTER_H_
 #define CONTENT_RENDERER_MEDIA_WEBRTC_WEBRTC_VIDEO_FRAME_ADAPTER_H_
 
 #include "media/base/video_frame.h"
 #include "third_party/webrtc/common_video/interface/video_frame_buffer.h"
 
@@ skipping 12 matching lines @@
   int height() const override;
 
   const uint8_t* data(webrtc::PlaneType type) const override;
 
   uint8_t* data(webrtc::PlaneType type) override;
 
   int stride(webrtc::PlaneType type) const override;
 
   void* native_handle() const override;
 
-  // TODO(pbos): Replace virtual with override as soon as this change lands in
-  // third_party/webrtc.
-  virtual rtc::scoped_refptr<VideoFrameBuffer> NativeToI420Buffer();
+  rtc::scoped_refptr<VideoFrameBuffer> NativeToI420Buffer() override;
 
   friend class rtc::RefCountedObject<WebRtcVideoFrameAdapter>;
 
  protected:
   ~WebRtcVideoFrameAdapter() override;
 
   scoped_refptr<media::VideoFrame> frame_;
 };
 
 }  // namespace content
 
 #endif  // CONTENT_RENDERER_MEDIA_WEBRTC_WEBRTC_VIDEO_FRAME_ADAPTER_H_