Roll WebRTC 11486:11495, Libjingle 11485:11495

content/renderer/media/webrtc/webrtc_video_capturer_adapter.h

 // 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.
 
 #ifndef CONTENT_RENDERER_MEDIA_WEBRTC_WEBRTC_VIDEO_CAPTURER_ADAPTER_H_
 #define CONTENT_RENDERER_MEDIA_WEBRTC_WEBRTC_VIDEO_CAPTURER_ADAPTER_H_
 
 #include <stdint.h>
 
 #include <vector>
 
 #include "base/compiler_specific.h"
 #include "base/macros.h"
 #include "base/threading/thread_checker.h"
 #include "content/common/content_export.h"
 #include "media/base/video_capture_types.h"
 #include "media/base/video_frame.h"
-#include "third_party/libjingle/source/talk/media/base/videocapturer.h"
+#include "third_party/webrtc/media/base/videocapturer.h"
 
 namespace content {
 
 // WebRtcVideoCapturerAdapter implements a simple cricket::VideoCapturer that is
 // used for VideoCapturing in libJingle and especially in PeerConnections.
 // The class is created and destroyed on the main render thread.
 // PeerConnection access cricket::VideoCapturer from a libJingle worker thread.
 // An instance of WebRtcVideoCapturerAdapter is owned by an instance of
 // webrtc::VideoSourceInterface in libJingle. The implementation of
 // webrtc::VideoSourceInterface guarantees that this object is not deleted
@@ skipping 28 matching lines @@
   bool running_;
 
   class MediaVideoFrameFactory;
 
   DISALLOW_COPY_AND_ASSIGN(WebRtcVideoCapturerAdapter);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_RENDERER_MEDIA_WEBRTC_WEBRTC_VIDEO_CAPTURER_ADAPTER_H_