From 8b06200802b0c155d112d4a5bf6da5dfb0c0cbec Mon Sep 17 00:00:00 2001
From: "pbos@webrtc.org" <pbos@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d>
Date: Fri, 12 Jul 2013 08:28:10 +0000
Subject: [PATCH] Include files from webrtc/.. paths in utility/.

BUG=1662
R=henrike@webrtc.org

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

git-svn-id: http://webrtc.googlecode.com/svn/trunk@4336 4adac7df-926f-26a2-2b94-8c16560cd09d
---
 .../interface/audio_frame_operations.h        |  2 +-
 .../modules/utility/interface/file_player.h   | 10 ++++----
 .../modules/utility/interface/file_recorder.h | 16 ++++++-------
 .../utility/interface/process_thread.h        |  2 +-
 webrtc/modules/utility/interface/rtp_dump.h   |  4 ++--
 .../utility/source/audio_frame_operations.cc  |  5 ++--
 .../source/audio_frame_operations_unittest.cc |  6 ++---
 webrtc/modules/utility/source/coder.cc        |  6 ++---
 webrtc/modules/utility/source/coder.h         |  6 ++---
 .../utility/source/file_player_impl.cc        |  4 ++--
 .../modules/utility/source/file_player_impl.h | 20 ++++++++--------
 .../utility/source/file_recorder_impl.cc      | 10 ++++----
 .../utility/source/file_recorder_impl.h       | 24 +++++++++----------
 webrtc/modules/utility/source/frame_scaler.cc |  6 ++---
 webrtc/modules/utility/source/frame_scaler.h  |  8 +++----
 .../utility/source/process_thread_impl.cc     |  6 ++---
 .../utility/source/process_thread_impl.h      | 12 +++++-----
 .../modules/utility/source/rtp_dump_impl.cc   |  6 ++---
 webrtc/modules/utility/source/rtp_dump_impl.h |  2 +-
 webrtc/modules/utility/source/video_coder.cc  |  2 +-
 webrtc/modules/utility/source/video_coder.h   |  4 ++--
 .../utility/source/video_frames_queue.cc      |  8 +++----
 .../utility/source/video_frames_queue.h       |  8 +++----
 23 files changed, 88 insertions(+), 89 deletions(-)

diff --git a/webrtc/modules/utility/interface/audio_frame_operations.h b/webrtc/modules/utility/interface/audio_frame_operations.h
index 4154e5e1d9..f439dacbcf 100644
--- a/webrtc/modules/utility/interface/audio_frame_operations.h
+++ b/webrtc/modules/utility/interface/audio_frame_operations.h
@@ -11,7 +11,7 @@
 #ifndef WEBRTC_VOICE_ENGINE_AUDIO_FRAME_OPERATIONS_H_
 #define WEBRTC_VOICE_ENGINE_AUDIO_FRAME_OPERATIONS_H_
 
-#include "typedefs.h"
+#include "webrtc/typedefs.h"
 
 namespace webrtc {
 
diff --git a/webrtc/modules/utility/interface/file_player.h b/webrtc/modules/utility/interface/file_player.h
index 7f5ecb49a1..0031f6a021 100644
--- a/webrtc/modules/utility/interface/file_player.h
+++ b/webrtc/modules/utility/interface/file_player.h
@@ -11,11 +11,11 @@
 #ifndef WEBRTC_MODULES_UTILITY_INTERFACE_FILE_PLAYER_H_
 #define WEBRTC_MODULES_UTILITY_INTERFACE_FILE_PLAYER_H_
 
-#include "common_types.h"
-#include "common_video/interface/i420_video_frame.h"
-#include "engine_configurations.h"
-#include "module_common_types.h"
-#include "typedefs.h"
+#include "webrtc/common_types.h"
+#include "webrtc/common_video/interface/i420_video_frame.h"
+#include "webrtc/engine_configurations.h"
+#include "webrtc/modules/interface/module_common_types.h"
+#include "webrtc/typedefs.h"
 
 namespace webrtc {
 class FileCallback;
diff --git a/webrtc/modules/utility/interface/file_recorder.h b/webrtc/modules/utility/interface/file_recorder.h
index f8139336f9..d75dd57d9f 100644
--- a/webrtc/modules/utility/interface/file_recorder.h
+++ b/webrtc/modules/utility/interface/file_recorder.h
@@ -11,14 +11,14 @@
 #ifndef WEBRTC_MODULES_UTILITY_INTERFACE_FILE_RECORDER_H_
 #define WEBRTC_MODULES_UTILITY_INTERFACE_FILE_RECORDER_H_
 
-#include "common_video/interface/i420_video_frame.h"
-#include "common_types.h"
-#include "engine_configurations.h"
-#include "modules/audio_coding/main/interface/audio_coding_module_typedefs.h"
-#include "modules/interface/module_common_types.h"
-#include "modules/media_file/interface/media_file_defines.h"
-#include "system_wrappers/interface/tick_util.h"
-#include "typedefs.h"
+#include "webrtc/common_types.h"
+#include "webrtc/common_video/interface/i420_video_frame.h"
+#include "webrtc/engine_configurations.h"
+#include "webrtc/modules/audio_coding/main/interface/audio_coding_module_typedefs.h"
+#include "webrtc/modules/interface/module_common_types.h"
+#include "webrtc/modules/media_file/interface/media_file_defines.h"
+#include "webrtc/system_wrappers/interface/tick_util.h"
+#include "webrtc/typedefs.h"
 
 namespace webrtc {
 
diff --git a/webrtc/modules/utility/interface/process_thread.h b/webrtc/modules/utility/interface/process_thread.h
index 75c9b1859c..cdbb4d3912 100644
--- a/webrtc/modules/utility/interface/process_thread.h
+++ b/webrtc/modules/utility/interface/process_thread.h
@@ -11,7 +11,7 @@
 #ifndef WEBRTC_MODULES_UTILITY_INTERFACE_PROCESS_THREAD_H_
 #define WEBRTC_MODULES_UTILITY_INTERFACE_PROCESS_THREAD_H_
 
-#include "typedefs.h"
+#include "webrtc/typedefs.h"
 
 namespace webrtc {
 class Module;
diff --git a/webrtc/modules/utility/interface/rtp_dump.h b/webrtc/modules/utility/interface/rtp_dump.h
index 62b8bf5b2c..6c2dc7c61d 100644
--- a/webrtc/modules/utility/interface/rtp_dump.h
+++ b/webrtc/modules/utility/interface/rtp_dump.h
@@ -16,8 +16,8 @@
 #ifndef WEBRTC_MODULES_UTILITY_INTERFACE_RTP_DUMP_H_
 #define WEBRTC_MODULES_UTILITY_INTERFACE_RTP_DUMP_H_
 
-#include "typedefs.h"
-#include "file_wrapper.h"
+#include "webrtc/system_wrappers/interface/file_wrapper.h"
+#include "webrtc/typedefs.h"
 
 namespace webrtc {
 class RtpDump
diff --git a/webrtc/modules/utility/source/audio_frame_operations.cc b/webrtc/modules/utility/source/audio_frame_operations.cc
index b21216d3b7..18dba52b65 100644
--- a/webrtc/modules/utility/source/audio_frame_operations.cc
+++ b/webrtc/modules/utility/source/audio_frame_operations.cc
@@ -8,8 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "audio_frame_operations.h"
-#include "module_common_types.h"
+#include "webrtc/modules/interface/module_common_types.h"
+#include "webrtc/modules/utility/interface/audio_frame_operations.h"
 
 namespace webrtc {
 
@@ -108,4 +108,3 @@ int AudioFrameOperations::ScaleWithSat(float scale, AudioFrame& frame) {
 }
 
 }  // namespace webrtc
-
diff --git a/webrtc/modules/utility/source/audio_frame_operations_unittest.cc b/webrtc/modules/utility/source/audio_frame_operations_unittest.cc
index efdebf6dd2..34c08a89e6 100644
--- a/webrtc/modules/utility/source/audio_frame_operations_unittest.cc
+++ b/webrtc/modules/utility/source/audio_frame_operations_unittest.cc
@@ -8,10 +8,10 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "gtest/gtest.h"
+#include "testing/gtest/include/gtest/gtest.h"
 
-#include "audio_frame_operations.h"
-#include "module_common_types.h"
+#include "webrtc/modules/interface/module_common_types.h"
+#include "webrtc/modules/utility/interface/audio_frame_operations.h"
 
 namespace webrtc {
 namespace {
diff --git a/webrtc/modules/utility/source/coder.cc b/webrtc/modules/utility/source/coder.cc
index 3cef5e509d..970c2367d8 100644
--- a/webrtc/modules/utility/source/coder.cc
+++ b/webrtc/modules/utility/source/coder.cc
@@ -8,9 +8,9 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "coder.h"
-#include "common_types.h"
-#include "module_common_types.h"
+#include "webrtc/common_types.h"
+#include "webrtc/modules/interface/module_common_types.h"
+#include "webrtc/modules/utility/source/coder.h"
 
 // OS independent case insensitive string comparison.
 #ifdef WIN32
diff --git a/webrtc/modules/utility/source/coder.h b/webrtc/modules/utility/source/coder.h
index a831c557ea..07ede062da 100644
--- a/webrtc/modules/utility/source/coder.h
+++ b/webrtc/modules/utility/source/coder.h
@@ -11,9 +11,9 @@
 #ifndef WEBRTC_MODULES_UTILITY_SOURCE_CODER_H_
 #define WEBRTC_MODULES_UTILITY_SOURCE_CODER_H_
 
-#include "audio_coding_module.h"
-#include "common_types.h"
-#include "typedefs.h"
+#include "webrtc/common_types.h"
+#include "webrtc/modules/audio_coding/main/interface/audio_coding_module.h"
+#include "webrtc/typedefs.h"
 
 namespace webrtc {
 class AudioFrame;
diff --git a/webrtc/modules/utility/source/file_player_impl.cc b/webrtc/modules/utility/source/file_player_impl.cc
index 3a06c72dae..db84371902 100644
--- a/webrtc/modules/utility/source/file_player_impl.cc
+++ b/webrtc/modules/utility/source/file_player_impl.cc
@@ -8,8 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "file_player_impl.h"
-#include "trace.h"
+#include "webrtc/modules/utility/source/file_player_impl.h"
+#include "webrtc/system_wrappers/interface/trace.h"
 
 #ifdef WEBRTC_MODULE_UTILITY_VIDEO
     #include "frame_scaler.h"
diff --git a/webrtc/modules/utility/source/file_player_impl.h b/webrtc/modules/utility/source/file_player_impl.h
index c6d6b5c116..aae1ae97f3 100644
--- a/webrtc/modules/utility/source/file_player_impl.h
+++ b/webrtc/modules/utility/source/file_player_impl.h
@@ -11,16 +11,16 @@
 #ifndef WEBRTC_MODULES_UTILITY_SOURCE_FILE_PLAYER_IMPL_H_
 #define WEBRTC_MODULES_UTILITY_SOURCE_FILE_PLAYER_IMPL_H_
 
-#include "coder.h"
-#include "common_types.h"
-#include "critical_section_wrapper.h"
-#include "engine_configurations.h"
-#include "file_player.h"
-#include "media_file_defines.h"
-#include "media_file.h"
-#include "resampler.h"
-#include "tick_util.h"
-#include "typedefs.h"
+#include "webrtc/common_audio/resampler/include/resampler.h"
+#include "webrtc/common_types.h"
+#include "webrtc/engine_configurations.h"
+#include "webrtc/modules/media_file/interface/media_file.h"
+#include "webrtc/modules/media_file/interface/media_file_defines.h"
+#include "webrtc/modules/utility/interface/file_player.h"
+#include "webrtc/modules/utility/source/coder.h"
+#include "webrtc/system_wrappers/interface/critical_section_wrapper.h"
+#include "webrtc/system_wrappers/interface/tick_util.h"
+#include "webrtc/typedefs.h"
 
 namespace webrtc {
 class VideoCoder;
diff --git a/webrtc/modules/utility/source/file_recorder_impl.cc b/webrtc/modules/utility/source/file_recorder_impl.cc
index 9e5db72ee6..e9e5b98d7e 100644
--- a/webrtc/modules/utility/source/file_recorder_impl.cc
+++ b/webrtc/modules/utility/source/file_recorder_impl.cc
@@ -8,11 +8,11 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "common_video/libyuv/include/webrtc_libyuv.h"
-#include "engine_configurations.h"
-#include "file_recorder_impl.h"
-#include "media_file.h"
-#include "trace.h"
+#include "webrtc/common_video/libyuv/include/webrtc_libyuv.h"
+#include "webrtc/engine_configurations.h"
+#include "webrtc/modules/media_file/interface/media_file.h"
+#include "webrtc/modules/utility/source/file_recorder_impl.h"
+#include "webrtc/system_wrappers/interface/trace.h"
 
 #ifdef WEBRTC_MODULE_UTILITY_VIDEO
     #include "critical_section_wrapper.h"
diff --git a/webrtc/modules/utility/source/file_recorder_impl.h b/webrtc/modules/utility/source/file_recorder_impl.h
index a55b73e45c..0b7290eddc 100644
--- a/webrtc/modules/utility/source/file_recorder_impl.h
+++ b/webrtc/modules/utility/source/file_recorder_impl.h
@@ -15,18 +15,18 @@
 #ifndef WEBRTC_MODULES_UTILITY_SOURCE_FILE_RECORDER_IMPL_H_
 #define WEBRTC_MODULES_UTILITY_SOURCE_FILE_RECORDER_IMPL_H_
 
-#include "coder.h"
-#include "common_types.h"
-#include "engine_configurations.h"
-#include "event_wrapper.h"
-#include "file_recorder.h"
-#include "media_file_defines.h"
-#include "media_file.h"
-#include "module_common_types.h"
-#include "resampler.h"
-#include "thread_wrapper.h"
-#include "tick_util.h"
-#include "typedefs.h"
+#include "webrtc/common_audio/resampler/include/resampler.h"
+#include "webrtc/common_types.h"
+#include "webrtc/engine_configurations.h"
+#include "webrtc/modules/interface/module_common_types.h"
+#include "webrtc/modules/media_file/interface/media_file.h"
+#include "webrtc/modules/media_file/interface/media_file_defines.h"
+#include "webrtc/modules/utility/interface/file_recorder.h"
+#include "webrtc/modules/utility/source/coder.h"
+#include "webrtc/system_wrappers/interface/event_wrapper.h"
+#include "webrtc/system_wrappers/interface/thread_wrapper.h"
+#include "webrtc/system_wrappers/interface/tick_util.h"
+#include "webrtc/typedefs.h"
 
 #ifdef WEBRTC_MODULE_UTILITY_VIDEO
     #include "frame_scaler.h"
diff --git a/webrtc/modules/utility/source/frame_scaler.cc b/webrtc/modules/utility/source/frame_scaler.cc
index 06689471da..ed127a6715 100644
--- a/webrtc/modules/utility/source/frame_scaler.cc
+++ b/webrtc/modules/utility/source/frame_scaler.cc
@@ -8,12 +8,12 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "modules/utility/source/frame_scaler.h"
+#include "webrtc/modules/utility/source/frame_scaler.h"
 
 #ifdef WEBRTC_MODULE_UTILITY_VIDEO
 
-#include "common_video/libyuv/include/scaler.h"
-#include "system_wrappers/interface/trace.h"
+#include "webrtc/common_video/libyuv/include/scaler.h"
+#include "webrtc/system_wrappers/interface/trace.h"
 
 namespace webrtc {
 
diff --git a/webrtc/modules/utility/source/frame_scaler.h b/webrtc/modules/utility/source/frame_scaler.h
index 4b2deae24b..cec5bfeef7 100644
--- a/webrtc/modules/utility/source/frame_scaler.h
+++ b/webrtc/modules/utility/source/frame_scaler.h
@@ -15,10 +15,10 @@
 
 #ifdef WEBRTC_MODULE_UTILITY_VIDEO
 
-#include "common_video/interface/i420_video_frame.h"
-#include "engine_configurations.h"
-#include "modules/interface/module_common_types.h"
-#include "system_wrappers/interface/scoped_ptr.h"
+#include "webrtc/common_video/interface/i420_video_frame.h"
+#include "webrtc/engine_configurations.h"
+#include "webrtc/modules/interface/module_common_types.h"
+#include "webrtc/system_wrappers/interface/scoped_ptr.h"
 
 namespace webrtc {
 
diff --git a/webrtc/modules/utility/source/process_thread_impl.cc b/webrtc/modules/utility/source/process_thread_impl.cc
index 2cd2a77580..08979d2493 100644
--- a/webrtc/modules/utility/source/process_thread_impl.cc
+++ b/webrtc/modules/utility/source/process_thread_impl.cc
@@ -8,9 +8,9 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "process_thread_impl.h"
-#include "module.h"
-#include "trace.h"
+#include "webrtc/modules/interface/module.h"
+#include "webrtc/modules/utility/source/process_thread_impl.h"
+#include "webrtc/system_wrappers/interface/trace.h"
 
 namespace webrtc {
 ProcessThread::~ProcessThread()
diff --git a/webrtc/modules/utility/source/process_thread_impl.h b/webrtc/modules/utility/source/process_thread_impl.h
index 99cd2b2259..d1913c47c4 100644
--- a/webrtc/modules/utility/source/process_thread_impl.h
+++ b/webrtc/modules/utility/source/process_thread_impl.h
@@ -11,12 +11,12 @@
 #ifndef WEBRTC_MODULES_UTILITY_SOURCE_PROCESS_THREAD_IMPL_H_
 #define WEBRTC_MODULES_UTILITY_SOURCE_PROCESS_THREAD_IMPL_H_
 
-#include "critical_section_wrapper.h"
-#include "event_wrapper.h"
-#include "list_wrapper.h"
-#include "process_thread.h"
-#include "thread_wrapper.h"
-#include "typedefs.h"
+#include "webrtc/modules/utility/interface/process_thread.h"
+#include "webrtc/system_wrappers/interface/critical_section_wrapper.h"
+#include "webrtc/system_wrappers/interface/event_wrapper.h"
+#include "webrtc/system_wrappers/interface/list_wrapper.h"
+#include "webrtc/system_wrappers/interface/thread_wrapper.h"
+#include "webrtc/typedefs.h"
 
 namespace webrtc {
 class ProcessThreadImpl : public ProcessThread
diff --git a/webrtc/modules/utility/source/rtp_dump_impl.cc b/webrtc/modules/utility/source/rtp_dump_impl.cc
index 9cc35c3129..d7c112fcba 100644
--- a/webrtc/modules/utility/source/rtp_dump_impl.cc
+++ b/webrtc/modules/utility/source/rtp_dump_impl.cc
@@ -8,13 +8,13 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "rtp_dump_impl.h"
+#include "webrtc/modules/utility/source/rtp_dump_impl.h"
 
 #include <cassert>
 #include <stdio.h>
 
-#include "critical_section_wrapper.h"
-#include "trace.h"
+#include "webrtc/system_wrappers/interface/critical_section_wrapper.h"
+#include "webrtc/system_wrappers/interface/trace.h"
 
 #if defined(_WIN32)
 #include <Windows.h>
diff --git a/webrtc/modules/utility/source/rtp_dump_impl.h b/webrtc/modules/utility/source/rtp_dump_impl.h
index b14c59725f..04ae7dfca2 100644
--- a/webrtc/modules/utility/source/rtp_dump_impl.h
+++ b/webrtc/modules/utility/source/rtp_dump_impl.h
@@ -11,7 +11,7 @@
 #ifndef WEBRTC_MODULES_UTILITY_SOURCE_RTP_DUMP_IMPL_H_
 #define WEBRTC_MODULES_UTILITY_SOURCE_RTP_DUMP_IMPL_H_
 
-#include "rtp_dump.h"
+#include "webrtc/modules/utility/interface/rtp_dump.h"
 
 namespace webrtc {
 class CriticalSectionWrapper;
diff --git a/webrtc/modules/utility/source/video_coder.cc b/webrtc/modules/utility/source/video_coder.cc
index cff2bddfad..bd8d8e841e 100644
--- a/webrtc/modules/utility/source/video_coder.cc
+++ b/webrtc/modules/utility/source/video_coder.cc
@@ -10,7 +10,7 @@
 
 #ifdef WEBRTC_MODULE_UTILITY_VIDEO
 
-#include "video_coder.h"
+#include "webrtc/modules/utility/source/video_coder.h"
 
 namespace webrtc {
 VideoCoder::VideoCoder(uint32_t instanceID)
diff --git a/webrtc/modules/utility/source/video_coder.h b/webrtc/modules/utility/source/video_coder.h
index e1460ef352..696da05787 100644
--- a/webrtc/modules/utility/source/video_coder.h
+++ b/webrtc/modules/utility/source/video_coder.h
@@ -13,8 +13,8 @@
 
 #ifdef WEBRTC_MODULE_UTILITY_VIDEO
 
-#include "engine_configurations.h"
-#include "video_coding.h"
+#include "webrtc/engine_configurations.h"
+#include "webrtc/modules/video_coding/main/interface/video_coding.h"
 
 namespace webrtc {
 class VideoCoder : public VCMPacketizationCallback, public VCMReceiveCallback
diff --git a/webrtc/modules/utility/source/video_frames_queue.cc b/webrtc/modules/utility/source/video_frames_queue.cc
index 85f8517825..7d6ea34b6f 100644
--- a/webrtc/modules/utility/source/video_frames_queue.cc
+++ b/webrtc/modules/utility/source/video_frames_queue.cc
@@ -8,15 +8,15 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "video_frames_queue.h"
+#include "webrtc/modules/utility/source/video_frames_queue.h"
 
 #ifdef WEBRTC_MODULE_UTILITY_VIDEO
 
 #include <cassert>
 
-#include "module_common_types.h"
-#include "tick_util.h"
-#include "trace.h"
+#include "webrtc/modules/interface/module_common_types.h"
+#include "webrtc/system_wrappers/interface/tick_util.h"
+#include "webrtc/system_wrappers/interface/trace.h"
 
 namespace webrtc {
 VideoFramesQueue::VideoFramesQueue()
diff --git a/webrtc/modules/utility/source/video_frames_queue.h b/webrtc/modules/utility/source/video_frames_queue.h
index 18c4375014..4316bf7c04 100644
--- a/webrtc/modules/utility/source/video_frames_queue.h
+++ b/webrtc/modules/utility/source/video_frames_queue.h
@@ -13,10 +13,10 @@
 
 #ifdef WEBRTC_MODULE_UTILITY_VIDEO
 
-#include "common_video/interface/i420_video_frame.h"
-#include "engine_configurations.h"
-#include "list_wrapper.h"
-#include "typedefs.h"
+#include "webrtc/common_video/interface/i420_video_frame.h"
+#include "webrtc/engine_configurations.h"
+#include "webrtc/system_wrappers/interface/list_wrapper.h"
+#include "webrtc/typedefs.h"
 
 namespace webrtc {