commit 3b187b9c0c4f404c31523e74909ee3b75a83846e
author Henrik Boström <hbos@webrtc.org> Thu May 28 11:43:38 2015 +0200
committer Henrik Boström <hbos@webrtc.org> Thu May 28 09:43:45 2015 +0000
tree 61dca4eb1f57f027311629c7ed2d22bb0cabdc12
parent 11beccd712dd52ae73c078332122070de3cb5c3d

Removed unnecessary includes of webrtcvideocapturer.h

R=tommi@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/57469004

Cr-Commit-Position: refs/heads/master@{#9305}

talk/app/webrtc/java/jni/peerconnection_jni.cc

diff --git a/talk/app/webrtc/java/jni/peerconnection_jni.cc b/talk/app/webrtc/java/jni/peerconnection_jni.cc
index bf41119..f96b026 100644
--- a/talk/app/webrtc/java/jni/peerconnection_jni.cc
+++ b/talk/app/webrtc/java/jni/peerconnection_jni.cc
@@ -67,7 +67,6 @@
 #include "talk/media/base/videocapturer.h"
 #include "talk/media/base/videorenderer.h"
 #include "talk/media/devices/videorendererfactory.h"
-#include "talk/media/webrtc/webrtcvideocapturer.h"
 #include "talk/media/webrtc/webrtcvideodecoderfactory.h"
 #include "talk/media/webrtc/webrtcvideoencoderfactory.h"
 #include "webrtc/base/bind.h"

talk/app/webrtc/videotrack.cc

diff --git a/talk/app/webrtc/videotrack.cc b/talk/app/webrtc/videotrack.cc
index 30aedca..7c78aea 100644
--- a/talk/app/webrtc/videotrack.cc
+++ b/talk/app/webrtc/videotrack.cc
@@ -29,8 +29,6 @@
 
 #include <string>
 
-#include "talk/media/webrtc/webrtcvideocapturer.h"
-
 namespace webrtc {
 
 static const char kVideoTrackKind[] = "video";

talk/libjingle.gyp

diff --git a/talk/libjingle.gyp b/talk/libjingle.gyp
index 9a69e84..ba4ad15 100755
--- a/talk/libjingle.gyp
+++ b/talk/libjingle.gyp
@@ -481,9 +481,9 @@
         'media/webrtc/webrtcpassthroughrender.cc',
         'media/webrtc/webrtcpassthroughrender.h',
         'media/webrtc/webrtcvideocapturer.cc',
+        'media/webrtc/webrtcvideocapturer.h',
         'media/webrtc/webrtcvideocapturerfactory.h',
         'media/webrtc/webrtcvideocapturerfactory.cc',
-        'media/webrtc/webrtcvideocapturer.h',
         'media/webrtc/webrtcvideodecoderfactory.h',
         'media/webrtc/webrtcvideoencoderfactory.h',
         'media/webrtc/webrtcvideoengine2.cc',

talk/media/webrtc/webrtcvideoengine2.cc

diff --git a/talk/media/webrtc/webrtcvideoengine2.cc b/talk/media/webrtc/webrtcvideoengine2.cc
index 3794f2f..a29ce77 100644
--- a/talk/media/webrtc/webrtcvideoengine2.cc
+++ b/talk/media/webrtc/webrtcvideoengine2.cc
@@ -36,7 +36,6 @@
 #include "talk/media/base/videorenderer.h"
 #include "talk/media/webrtc/constants.h"
 #include "talk/media/webrtc/simulcast.h"
-#include "talk/media/webrtc/webrtcvideocapturer.h"
 #include "talk/media/webrtc/webrtcvideoencoderfactory.h"
 #include "talk/media/webrtc/webrtcvideoframe.h"
 #include "talk/media/webrtc/webrtcvoiceengine.h"