Remove include dirs from modules/{media_file,pacing}

Also move files out of media_file/source.

BUG=webrtc:5095
TESTED=git cl try -c --bot=android_compile_rel --bot=linux_compile_rel --bot=win_compile_rel --bot=mac_compile_rel --bot=ios_rel --bot=linux_gn_rel --bot=win_x64_gn_rel --bot=mac_x64_gn_rel --bot=android_gn_rel -m tryserver.webrtc
R=asapersson@webrtc.org, perkj@webrtc.org, tommi@webrtc.org

Review URL: https://codereview.webrtc.org/1435093002 .

Cr-Original-Commit-Position: refs/heads/master@{#10647}
Cr-Mirrored-From: https://chromium.googlesource.com/external/webrtc
Cr-Mirrored-Commit: 0b9e29c87da2d9c1a3792d2c87197b0688b68e4e

modules/pacing/BUILD.gn

diff --git a/modules/pacing/BUILD.gn b/modules/pacing/BUILD.gn
index 3e478c1..0354c64 100644
--- a/modules/pacing/BUILD.gn
+++ b/modules/pacing/BUILD.gn
@@ -10,10 +10,10 @@
   sources = [
     "bitrate_prober.cc",
     "bitrate_prober.h",
-    "include/paced_sender.h",
-    "include/packet_router.h",
     "paced_sender.cc",
+    "paced_sender.h",
     "packet_router.cc",
+    "packet_router.h",
   ]
 
   configs += [ "../..:common_config" ]

modules/pacing/bitrate_prober.cc

diff --git a/modules/pacing/bitrate_prober.cc b/modules/pacing/bitrate_prober.cc
index bbbe54f..db903f0 100644
--- a/modules/pacing/bitrate_prober.cc
+++ b/modules/pacing/bitrate_prober.cc
@@ -15,7 +15,7 @@
 #include <limits>
 #include <sstream>
 
-#include "webrtc/modules/pacing/include/paced_sender.h"
+#include "webrtc/modules/pacing/paced_sender.h"
 #include "webrtc/system_wrappers/include/logging.h"
 
 namespace webrtc {

modules/pacing/mock/mock_paced_sender.h

diff --git a/modules/pacing/include/mock/mock_paced_sender.h b/modules/pacing/mock/mock_paced_sender.h
similarity index 81%
rename from modules/pacing/include/mock/mock_paced_sender.h
rename to modules/pacing/mock/mock_paced_sender.h
index b2cefdf..01d5f6a 100644
--- a/modules/pacing/include/mock/mock_paced_sender.h
+++ b/modules/pacing/mock/mock_paced_sender.h
@@ -8,14 +8,14 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef WEBRTC_MODULES_PACING_INCLUDE_MOCK_MOCK_PACED_SENDER_H_
-#define WEBRTC_MODULES_PACING_INCLUDE_MOCK_MOCK_PACED_SENDER_H_
+#ifndef WEBRTC_MODULES_PACING_MOCK_MOCK_PACED_SENDER_H_
+#define WEBRTC_MODULES_PACING_MOCK_MOCK_PACED_SENDER_H_
 
 #include "testing/gmock/include/gmock/gmock.h"
 
 #include <vector>
 
-#include "webrtc/modules/pacing/include/paced_sender.h"
+#include "webrtc/modules/pacing/paced_sender.h"
 #include "webrtc/system_wrappers/include/clock.h"
 
 namespace webrtc {
@@ -35,4 +35,4 @@
 
 }  // namespace webrtc
 
-#endif  // WEBRTC_MODULES_PACING_INCLUDE_MOCK_MOCK_PACED_SENDER_H_
+#endif  // WEBRTC_MODULES_PACING_MOCK_MOCK_PACED_SENDER_H_

modules/pacing/paced_sender.cc

diff --git a/modules/pacing/paced_sender.cc b/modules/pacing/paced_sender.cc
index 4088715..3c299f8 100644
--- a/modules/pacing/paced_sender.cc
+++ b/modules/pacing/paced_sender.cc
@@ -8,7 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "webrtc/modules/pacing/include/paced_sender.h"
+#include "webrtc/modules/pacing/paced_sender.h"
 
 #include <assert.h>
 

modules/pacing/paced_sender.h

diff --git a/modules/pacing/include/paced_sender.h b/modules/pacing/paced_sender.h
similarity index 96%
rename from modules/pacing/include/paced_sender.h
rename to modules/pacing/paced_sender.h
index 2c8e36e..fa9f59a 100644
--- a/modules/pacing/include/paced_sender.h
+++ b/modules/pacing/paced_sender.h
@@ -8,8 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef WEBRTC_MODULES_PACING_INCLUDE_PACED_SENDER_H_
-#define WEBRTC_MODULES_PACING_INCLUDE_PACED_SENDER_H_
+#ifndef WEBRTC_MODULES_PACING_PACED_SENDER_H_
+#define WEBRTC_MODULES_PACING_PACED_SENDER_H_
 
 #include <list>
 #include <set>
@@ -150,4 +150,4 @@
   uint64_t packet_counter_;
 };
 }  // namespace webrtc
-#endif  // WEBRTC_MODULES_PACING_INCLUDE_PACED_SENDER_H_
+#endif  // WEBRTC_MODULES_PACING_PACED_SENDER_H_

modules/pacing/paced_sender_unittest.cc

diff --git a/modules/pacing/paced_sender_unittest.cc b/modules/pacing/paced_sender_unittest.cc
index c27444c..78a49cd 100644
--- a/modules/pacing/paced_sender_unittest.cc
+++ b/modules/pacing/paced_sender_unittest.cc
@@ -12,7 +12,7 @@
 
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
-#include "webrtc/modules/pacing/include/paced_sender.h"
+#include "webrtc/modules/pacing/paced_sender.h"
 #include "webrtc/system_wrappers/include/clock.h"
 
 using testing::_;

modules/pacing/pacing.gypi

diff --git a/modules/pacing/pacing.gypi b/modules/pacing/pacing.gypi
index faa9784..90f663c 100644
--- a/modules/pacing/pacing.gypi
+++ b/modules/pacing/pacing.gypi
@@ -17,12 +17,12 @@
         '<(webrtc_root)/modules/modules.gyp:rtp_rtcp',
       ],
       'sources': [
-        'include/paced_sender.h',
-        'include/packet_router.h',
         'bitrate_prober.cc',
         'bitrate_prober.h',
         'paced_sender.cc',
+        'paced_sender.h',
         'packet_router.cc',
+        'packet_router.h',
       ],
     },
   ], # targets

modules/pacing/packet_router.cc

diff --git a/modules/pacing/packet_router.cc b/modules/pacing/packet_router.cc
index 7af74ec..5fd3508 100644
--- a/modules/pacing/packet_router.cc
+++ b/modules/pacing/packet_router.cc
@@ -8,7 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "webrtc/modules/pacing/include/packet_router.h"
+#include "webrtc/modules/pacing/packet_router.h"
 
 #include "webrtc/base/atomicops.h"
 #include "webrtc/base/checks.h"

modules/pacing/packet_router.h

diff --git a/modules/pacing/include/packet_router.h b/modules/pacing/packet_router.h
similarity index 89%
rename from modules/pacing/include/packet_router.h
rename to modules/pacing/packet_router.h
index 7a65295..edef1aa 100644
--- a/modules/pacing/include/packet_router.h
+++ b/modules/pacing/packet_router.h
@@ -8,8 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef WEBRTC_MODULES_PACING_INCLUDE_PACKET_ROUTER_H_
-#define WEBRTC_MODULES_PACING_INCLUDE_PACKET_ROUTER_H_
+#ifndef WEBRTC_MODULES_PACING_PACKET_ROUTER_H_
+#define WEBRTC_MODULES_PACING_PACKET_ROUTER_H_
 
 #include <list>
 
@@ -18,7 +18,7 @@
 #include "webrtc/base/scoped_ptr.h"
 #include "webrtc/base/thread_annotations.h"
 #include "webrtc/common_types.h"
-#include "webrtc/modules/pacing/include/paced_sender.h"
+#include "webrtc/modules/pacing/paced_sender.h"
 #include "webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h"
 
 namespace webrtc {
@@ -63,4 +63,4 @@
   RTC_DISALLOW_COPY_AND_ASSIGN(PacketRouter);
 };
 }  // namespace webrtc
-#endif  // WEBRTC_MODULES_PACING_INCLUDE_PACKET_ROUTER_H_
+#endif  // WEBRTC_MODULES_PACING_PACKET_ROUTER_H_

modules/pacing/packet_router_unittest.cc

diff --git a/modules/pacing/packet_router_unittest.cc b/modules/pacing/packet_router_unittest.cc
index f17f797..31acf44 100644
--- a/modules/pacing/packet_router_unittest.cc
+++ b/modules/pacing/packet_router_unittest.cc
@@ -13,7 +13,7 @@
 #include "webrtc/base/checks.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
-#include "webrtc/modules/pacing/include/packet_router.h"
+#include "webrtc/modules/pacing/packet_router.h"
 #include "webrtc/modules/rtp_rtcp/include/rtp_rtcp.h"
 #include "webrtc/modules/rtp_rtcp/mocks/mock_rtp_rtcp.h"
 #include "webrtc/base/scoped_ptr.h"