Roll WebRTC 8931:8933, Libjingle 8930:8932

content/renderer/media/webrtc/webrtc_video_capturer_adapter.cc

 // Copyright 2014 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.
 
 #include "content/renderer/media/webrtc/webrtc_video_capturer_adapter.h"
 
 #include "base/bind.h"
 #include "base/memory/aligned_memory.h"
 #include "base/trace_event/trace_event.h"
 #include "media/base/video_frame.h"
@@ skipping 47 matching lines @@
 
   uint8_t* data(webrtc::PlaneType type) override {
     NOTREACHED();
     return nullptr;
   }
 
   int stride(webrtc::PlaneType type) const override {
     return frame_->stride(WebRtcToMediaPlaneType(type));
   }
 
-  rtc::scoped_refptr<webrtc::NativeHandle> native_handle() const override {
-    return nullptr;
-  }
+  void* native_handle() const override { return nullptr; }
 
   ~VideoFrameWrapper() override {}
   friend class rtc::RefCountedObject<VideoFrameWrapper>;
 
   scoped_refptr<media::VideoFrame> frame_;
 };
 
 }  // anonymous namespace
 
 // A cricket::VideoFrameFactory for media::VideoFrame. The purpose of this
@@ skipping 197 matching lines @@
   DCHECK(frame_factory_ == frame_factory());
   frame_factory_->SetFrame(frame, elapsed_time);
 
   // This signals to libJingle that a new VideoFrame is available.
   SignalFrameCaptured(this, frame_factory_->GetCapturedFrame());
 
   frame_factory_->ReleaseFrame();  // Release the frame ASAP.
 }
 
 }  // namespace content