Roll WebRTC 11486:11495, Libjingle 11485:11495

remoting/protocol/webrtc_video_capturer_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_capturer_adapter.h"
 
 #include <utility>
 
-#include "third_party/libjingle/source/talk/media/webrtc/webrtcvideoframe.h"
 #include "third_party/libyuv/include/libyuv/convert.h"
+#include "third_party/webrtc/media/webrtc/webrtcvideoframe.h"
 #include "third_party/webrtc/modules/desktop_capture/desktop_frame.h"
 
 namespace remoting {
 namespace protocol {
 
 // Number of frames to be captured per second.
 const int kFramesPerSec = 30;
 
 WebrtcVideoCapturerAdapter::WebrtcVideoCapturerAdapter(
     scoped_ptr<webrtc::DesktopCapturer> capturer)
@@ skipping 204 matching lines @@
   DCHECK(thread_checker_.CalledOnValidThread());
 
   if (capture_pending_)
     return;
   capture_pending_ = true;
   desktop_capturer_->Capture(webrtc::DesktopRegion());
 }
 
 }  // namespace protocol
 }  // namespace remoting