commit e835019d5eb1a5ebeebaf3ab5e3e5ab722183249
author pbos@webrtc.org <pbos@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> Wed Jul 10 15:02:02 2013
committer pbos@webrtc.org <pbos@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> Wed Jul 10 15:02:02 2013
tree 0666e39250e0574c675835a683bb5605a4344771
parent 778a17273c957a68c17a613969a3d2475f209737

Include files from webrtc/.. paths in video_engine/.

BUG=1662
R=holmer@google.com, stefan@webrtc.org

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

git-svn-id: http://webrtc.googlecode.com/svn/trunk/webrtc@4324 4adac7df-926f-26a2-2b94-8c16560cd09d

video_engine/test/common/gl/gl_renderer.h

diff --git a/video_engine/test/common/gl/gl_renderer.h b/video_engine/test/common/gl/gl_renderer.h
index cd8ea44..033f1cb 100644
--- a/video_engine/test/common/gl/gl_renderer.h
+++ b/video_engine/test/common/gl/gl_renderer.h
@@ -17,8 +17,8 @@
 #include <GL/gl.h>
 #endif
 
-#include "webrtc/video_engine/test/common/video_renderer.h"
 #include "webrtc/typedefs.h"
+#include "webrtc/video_engine/test/common/video_renderer.h"
 
 
 namespace webrtc {

video_engine/test/common/linux/glx_renderer.h

diff --git a/video_engine/test/common/linux/glx_renderer.h b/video_engine/test/common/linux/glx_renderer.h
index eb12654..5a2f562 100644
--- a/video_engine/test/common/linux/glx_renderer.h
+++ b/video_engine/test/common/linux/glx_renderer.h
@@ -14,8 +14,8 @@
 #include <GL/glx.h>
 #include <X11/Xlib.h>
 
-#include "webrtc/video_engine/test/common/gl/gl_renderer.h"
 #include "webrtc/typedefs.h"
+#include "webrtc/video_engine/test/common/gl/gl_renderer.h"
 
 namespace webrtc {
 namespace test {

video_engine/test/common/null_platform_renderer.cc

diff --git a/video_engine/test/common/null_platform_renderer.cc b/video_engine/test/common/null_platform_renderer.cc
index db8c654..a79ee1d 100644
--- a/video_engine/test/common/null_platform_renderer.cc
+++ b/video_engine/test/common/null_platform_renderer.cc
@@ -20,4 +20,3 @@
 }
 }  // test
 }  // webrtc
-

video_engine/test/common/video_capturer.cc

diff --git a/video_engine/test/common/video_capturer.cc b/video_engine/test/common/video_capturer.cc
index 010b4c5..30988c2 100644
--- a/video_engine/test/common/video_capturer.cc
+++ b/video_engine/test/common/video_capturer.cc
@@ -10,7 +10,7 @@
 
 #include "webrtc/video_engine/test/common/video_capturer.h"
 
-#include "test/testsupport/fileutils.h"
+#include "webrtc/test/testsupport/fileutils.h"
 #include "webrtc/video_engine/test/common/file_capturer.h"
 #include "webrtc/video_engine/test/common/frame_generator.h"
 #include "webrtc/video_engine/test/common/frame_generator_capturer.h"

video_engine/test/full_stack.cc

diff --git a/video_engine/test/full_stack.cc b/video_engine/test/full_stack.cc
index b2a37ce..b19d20a 100644
--- a/video_engine/test/full_stack.cc
+++ b/video_engine/test/full_stack.cc
@@ -12,8 +12,8 @@
 #include <deque>
 #include <map>
 
-#include "testing/gtest/include/gtest/gtest.h"
 #include "gflags/gflags.h"
+#include "testing/gtest/include/gtest/gtest.h"
 
 #include "webrtc/common_video/libyuv/include/webrtc_libyuv.h"
 #include "webrtc/modules/rtp_rtcp/interface/rtp_header_parser.h"