Roll WebRTC 11486:11495, Libjingle 11485:11495

remoting/protocol/webrtc_video_renderer_adapter.cc

 // 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.
 
 #include "remoting/protocol/webrtc_video_renderer_adapter.h"
 
 #include <utility>
 
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/location.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/single_thread_task_runner.h"
 #include "base/thread_task_runner_handle.h"
 #include "remoting/protocol/frame_consumer.h"
-#include "third_party/libjingle/source/talk/media/base/videoframe.h"
 #include "third_party/libyuv/include/libyuv/video_common.h"
+#include "third_party/webrtc/media/base/videoframe.h"
 #include "third_party/webrtc/modules/desktop_capture/desktop_frame.h"
 
 namespace remoting {
 namespace protocol {
 
 WebrtcVideoRendererAdapter::WebrtcVideoRendererAdapter(
     scoped_refptr<webrtc::MediaStreamInterface> media_stream,
     FrameConsumer* frame_consumer)
     : media_stream_(std::move(media_stream)),
       frame_consumer_(frame_consumer),
@@ skipping 42 matching lines @@
 }
 
 void WebrtcVideoRendererAdapter::DrawFrame(
     scoped_ptr<webrtc::DesktopFrame> frame) {
   DCHECK(task_runner_->BelongsToCurrentThread());
   frame_consumer_->DrawFrame(std::move(frame), base::Closure());
 }
 
 }  // namespace remoting
 }  // namespace protocol