(5) Rename files to snake_case: install forwarding headers

Mechanically generated with this command:

tools_webrtc/do-renames.sh install all-renames.txt && git cl format

Bug: webrtc:10159
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Change-Id: Ic8e99f71f2da62e5c99863c6d24a8cfe311466cd
Reviewed-on: https://webrtc-review.googlesource.com/c/115682
Reviewed-by: Karl Wiberg <kwiberg@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#26227}

api/BUILD.gn

@@ -41,6 +41,7 @@ rtc_source_set("callfactory_api") {
   visibility = [ "*" ]
   sources = [
     "call/call_factory_interface.h",
+    "call/callfactoryinterface.h",
   ]
 }
 
@@ -78,23 +79,33 @@ rtc_static_library("libjingle_peerconnection_api") {
   cflags = []
   sources = [
     "async_resolver_factory.h",
+    "asyncresolverfactory.h",
     "bitrate_constraints.h",
     "candidate.cc",
     "candidate.h",
     "crypto/crypto_options.cc",
     "crypto/crypto_options.h",
+    "crypto/cryptooptions.h",
     "crypto/frame_decryptor_interface.h",
     "crypto/frame_encryptor_interface.h",
+    "crypto/framedecryptorinterface.h",
+    "crypto/frameencryptorinterface.h",
     "crypto_params.h",
+    "cryptoparams.h",
     "data_channel_interface.cc",
     "data_channel_interface.h",
+    "datachannelinterface.h",
     "dtls_transport_interface.h",
+    "dtlstransportinterface.h",
     "dtmf_sender_interface.h",
+    "dtmfsenderinterface.h",
     "jsep.cc",
     "jsep.h",
     "jsep_ice_candidate.cc",
     "jsep_ice_candidate.h",
     "jsep_session_description.h",
+    "jsepicecandidate.h",
+    "jsepsessiondescription.h",
     "media_constraints_interface.cc",
     "media_constraints_interface.h",
     "media_stream_interface.cc",
@@ -105,15 +116,24 @@ rtc_static_library("libjingle_peerconnection_api") {
     "media_transport_interface.h",
     "media_types.cc",
     "media_types.h",
+    "mediaconstraintsinterface.h",
+    "mediastreaminterface.h",
+    "mediastreamproxy.h",
+    "mediastreamtrackproxy.h",
+    "mediatypes.h",
     "notifier.h",
     "peer_connection_factory_proxy.h",
     "peer_connection_interface.cc",
     "peer_connection_interface.h",
     "peer_connection_proxy.h",
+    "peerconnectionfactoryproxy.h",
+    "peerconnectioninterface.h",
+    "peerconnectionproxy.h",
     "proxy.cc",
     "proxy.h",
     "rtc_error.cc",
     "rtc_error.h",
+    "rtcerror.h",
     "rtp_headers.cc",
     "rtp_headers.h",
     "rtp_parameters.cc",
@@ -124,12 +144,21 @@ rtc_static_library("libjingle_peerconnection_api") {
     "rtp_sender_interface.h",
     "rtp_transceiver_interface.cc",
     "rtp_transceiver_interface.h",
+    "rtpparameters.h",
+    "rtpreceiverinterface.h",
+    "rtpsenderinterface.h",
+    "rtptransceiverinterface.h",
     "set_remote_description_observer_interface.h",
+    "setremotedescriptionobserverinterface.h",
     "stats_types.cc",
     "stats_types.h",
+    "statstypes.h",
     "turn_customizer.h",
+    "turncustomizer.h",
     "uma_metrics.h",
+    "umametrics.h",
     "video_track_source_proxy.h",
+    "videosourceproxy.h",
   ]
   deps = [
     ":array_view",
@@ -241,6 +270,7 @@ rtc_source_set("libjingle_logging_api") {
   visibility = [ "*" ]
   sources = [
     "rtc_event_log_output.h",
+    "rtceventlogoutput.h",
   ]
 }
 
@@ -248,8 +278,11 @@ rtc_source_set("ortc_api") {
   visibility = [ "*" ]
   sources = [
     "ortc/packet_transport_interface.h",
+    "ortc/packettransportinterface.h",
     "ortc/rtp_transport_interface.h",
+    "ortc/rtptransportinterface.h",
     "ortc/srtp_transport_interface.h",
+    "ortc/srtptransportinterface.h",
   ]
 
   deps = [
@@ -265,7 +298,10 @@ rtc_source_set("rtc_stats_api") {
     "stats/rtc_stats.h",
     "stats/rtc_stats_collector_callback.h",
     "stats/rtc_stats_report.h",
+    "stats/rtcstats.h",
     "stats/rtcstats_objects.h",
+    "stats/rtcstatscollectorcallback.h",
+    "stats/rtcstatsreport.h",
   ]
 
   deps = [
@@ -347,6 +383,7 @@ rtc_source_set("refcountedbase") {
   visibility = [ "*" ]
   sources = [
     "ref_counted_base.h",
+    "refcountedbase.h",
   ]
   deps = [
     "../rtc_base:rtc_base_approved",
@@ -358,6 +395,7 @@ rtc_source_set("libjingle_peerconnection_test_api") {
   testonly = true
   sources = [
     "test/fake_constraints.h",
+    "test/fakeconstraints.h",
   ]
 
   deps = [

api/asyncresolverfactory.h

@@ -0,0 +1,19 @@
+/*
+ *  Copyright 2019 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef API_ASYNCRESOLVERFACTORY_H_
+#define API_ASYNCRESOLVERFACTORY_H_
+
+// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
+// been updated to include the new path.
+
+#include "api/async_resolver_factory.h"
+
+#endif  // API_ASYNCRESOLVERFACTORY_H_

api/call/callfactoryinterface.h

@@ -0,0 +1,19 @@
+/*
+ *  Copyright 2019 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef API_CALL_CALLFACTORYINTERFACE_H_
+#define API_CALL_CALLFACTORYINTERFACE_H_
+
+// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
+// been updated to include the new path.
+
+#include "api/call/call_factory_interface.h"
+
+#endif  // API_CALL_CALLFACTORYINTERFACE_H_

api/crypto/cryptooptions.h

@@ -0,0 +1,19 @@
+/*
+ *  Copyright 2019 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef API_CRYPTO_CRYPTOOPTIONS_H_
+#define API_CRYPTO_CRYPTOOPTIONS_H_
+
+// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
+// been updated to include the new path.
+
+#include "api/crypto/crypto_options.h"
+
+#endif  // API_CRYPTO_CRYPTOOPTIONS_H_

api/crypto/framedecryptorinterface.h

@@ -0,0 +1,19 @@
+/*
+ *  Copyright 2019 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef API_CRYPTO_FRAMEDECRYPTORINTERFACE_H_
+#define API_CRYPTO_FRAMEDECRYPTORINTERFACE_H_
+
+// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
+// been updated to include the new path.
+
+#include "api/crypto/frame_decryptor_interface.h"
+
+#endif  // API_CRYPTO_FRAMEDECRYPTORINTERFACE_H_

api/crypto/frameencryptorinterface.h

@@ -0,0 +1,19 @@
+/*
+ *  Copyright 2019 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef API_CRYPTO_FRAMEENCRYPTORINTERFACE_H_
+#define API_CRYPTO_FRAMEENCRYPTORINTERFACE_H_
+
+// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
+// been updated to include the new path.
+
+#include "api/crypto/frame_encryptor_interface.h"
+
+#endif  // API_CRYPTO_FRAMEENCRYPTORINTERFACE_H_

api/cryptoparams.h

@@ -0,0 +1,19 @@
+/*
+ *  Copyright 2019 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef API_CRYPTOPARAMS_H_
+#define API_CRYPTOPARAMS_H_
+
+// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
+// been updated to include the new path.
+
+#include "api/crypto_params.h"
+
+#endif  // API_CRYPTOPARAMS_H_

api/datachannelinterface.h

@@ -0,0 +1,19 @@
+/*
+ *  Copyright 2019 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef API_DATACHANNELINTERFACE_H_
+#define API_DATACHANNELINTERFACE_H_
+
+// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
+// been updated to include the new path.
+
+#include "api/data_channel_interface.h"
+
+#endif  // API_DATACHANNELINTERFACE_H_

api/dtlstransportinterface.h

@@ -0,0 +1,19 @@
+/*
+ *  Copyright 2019 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef API_DTLSTRANSPORTINTERFACE_H_
+#define API_DTLSTRANSPORTINTERFACE_H_
+
+// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
+// been updated to include the new path.
+
+#include "api/dtls_transport_interface.h"
+
+#endif  // API_DTLSTRANSPORTINTERFACE_H_

api/dtmfsenderinterface.h

@@ -0,0 +1,19 @@
+/*
+ *  Copyright 2019 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef API_DTMFSENDERINTERFACE_H_
+#define API_DTMFSENDERINTERFACE_H_
+
+// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
+// been updated to include the new path.
+
+#include "api/dtmf_sender_interface.h"
+
+#endif  // API_DTMFSENDERINTERFACE_H_

api/jsepicecandidate.h

@@ -0,0 +1,19 @@
+/*
+ *  Copyright 2019 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef API_JSEPICECANDIDATE_H_
+#define API_JSEPICECANDIDATE_H_
+
+// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
+// been updated to include the new path.
+
+#include "api/jsep_ice_candidate.h"
+
+#endif  // API_JSEPICECANDIDATE_H_

api/jsepsessiondescription.h

@@ -0,0 +1,19 @@
+/*
+ *  Copyright 2019 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef API_JSEPSESSIONDESCRIPTION_H_
+#define API_JSEPSESSIONDESCRIPTION_H_
+
+// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
+// been updated to include the new path.
+
+#include "api/jsep_session_description.h"
+
+#endif  // API_JSEPSESSIONDESCRIPTION_H_

api/mediaconstraintsinterface.h

@@ -0,0 +1,19 @@
+/*
+ *  Copyright 2019 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef API_MEDIACONSTRAINTSINTERFACE_H_
+#define API_MEDIACONSTRAINTSINTERFACE_H_
+
+// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
+// been updated to include the new path.
+
+#include "api/media_constraints_interface.h"
+
+#endif  // API_MEDIACONSTRAINTSINTERFACE_H_

api/mediastreaminterface.h

@@ -0,0 +1,19 @@
+/*
+ *  Copyright 2019 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef API_MEDIASTREAMINTERFACE_H_
+#define API_MEDIASTREAMINTERFACE_H_
+
+// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
+// been updated to include the new path.
+
+#include "api/media_stream_interface.h"
+
+#endif  // API_MEDIASTREAMINTERFACE_H_

api/mediastreamproxy.h

@@ -0,0 +1,19 @@
+/*
+ *  Copyright 2019 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef API_MEDIASTREAMPROXY_H_
+#define API_MEDIASTREAMPROXY_H_
+
+// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
+// been updated to include the new path.
+
+#include "api/media_stream_proxy.h"
+
+#endif  // API_MEDIASTREAMPROXY_H_

api/mediastreamtrackproxy.h

@@ -0,0 +1,19 @@
+/*
+ *  Copyright 2019 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef API_MEDIASTREAMTRACKPROXY_H_
+#define API_MEDIASTREAMTRACKPROXY_H_
+
+// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
+// been updated to include the new path.
+
+#include "api/media_stream_track_proxy.h"
+
+#endif  // API_MEDIASTREAMTRACKPROXY_H_

api/mediatypes.h

@@ -0,0 +1,19 @@
+/*
+ *  Copyright 2019 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef API_MEDIATYPES_H_
+#define API_MEDIATYPES_H_
+
+// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
+// been updated to include the new path.
+
+#include "api/media_types.h"
+
+#endif  // API_MEDIATYPES_H_

api/ortc/packettransportinterface.h

@@ -0,0 +1,19 @@
+/*
+ *  Copyright 2019 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef API_ORTC_PACKETTRANSPORTINTERFACE_H_
+#define API_ORTC_PACKETTRANSPORTINTERFACE_H_
+
+// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
+// been updated to include the new path.
+
+#include "api/ortc/packet_transport_interface.h"
+
+#endif  // API_ORTC_PACKETTRANSPORTINTERFACE_H_

api/ortc/rtptransportinterface.h

@@ -0,0 +1,19 @@
+/*
+ *  Copyright 2019 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef API_ORTC_RTPTRANSPORTINTERFACE_H_
+#define API_ORTC_RTPTRANSPORTINTERFACE_H_
+
+// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
+// been updated to include the new path.
+
+#include "api/ortc/rtp_transport_interface.h"
+
+#endif  // API_ORTC_RTPTRANSPORTINTERFACE_H_

api/ortc/srtptransportinterface.h

@@ -0,0 +1,19 @@
+/*
+ *  Copyright 2019 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef API_ORTC_SRTPTRANSPORTINTERFACE_H_
+#define API_ORTC_SRTPTRANSPORTINTERFACE_H_
+
+// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
+// been updated to include the new path.
+
+#include "api/ortc/srtp_transport_interface.h"
+
+#endif  // API_ORTC_SRTPTRANSPORTINTERFACE_H_

api/peerconnectionfactoryproxy.h

@@ -0,0 +1,19 @@
+/*
+ *  Copyright 2019 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef API_PEERCONNECTIONFACTORYPROXY_H_
+#define API_PEERCONNECTIONFACTORYPROXY_H_
+
+// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
+// been updated to include the new path.
+
+#include "api/peer_connection_factory_proxy.h"
+
+#endif  // API_PEERCONNECTIONFACTORYPROXY_H_

api/peerconnectioninterface.h

@@ -0,0 +1,19 @@
+/*
+ *  Copyright 2019 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef API_PEERCONNECTIONINTERFACE_H_
+#define API_PEERCONNECTIONINTERFACE_H_
+
+// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
+// been updated to include the new path.
+
+#include "api/peer_connection_interface.h"
+
+#endif  // API_PEERCONNECTIONINTERFACE_H_

api/peerconnectionproxy.h

@@ -0,0 +1,19 @@
+/*
+ *  Copyright 2019 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef API_PEERCONNECTIONPROXY_H_
+#define API_PEERCONNECTIONPROXY_H_
+
+// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
+// been updated to include the new path.
+
+#include "api/peer_connection_proxy.h"
+
+#endif  // API_PEERCONNECTIONPROXY_H_

api/refcountedbase.h

@@ -0,0 +1,19 @@
+/*
+ *  Copyright 2019 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef API_REFCOUNTEDBASE_H_
+#define API_REFCOUNTEDBASE_H_
+
+// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
+// been updated to include the new path.
+
+#include "api/ref_counted_base.h"
+
+#endif  // API_REFCOUNTEDBASE_H_

api/rtcerror.h

@@ -0,0 +1,19 @@
+/*
+ *  Copyright 2019 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef API_RTCERROR_H_
+#define API_RTCERROR_H_
+
+// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
+// been updated to include the new path.
+
+#include "api/rtc_error.h"
+
+#endif  // API_RTCERROR_H_

api/rtceventlogoutput.h

@@ -0,0 +1,19 @@
+/*
+ *  Copyright 2019 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef API_RTCEVENTLOGOUTPUT_H_
+#define API_RTCEVENTLOGOUTPUT_H_
+
+// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
+// been updated to include the new path.
+
+#include "api/rtc_event_log_output.h"
+
+#endif  // API_RTCEVENTLOGOUTPUT_H_

api/rtpparameters.h

@@ -0,0 +1,19 @@
+/*
+ *  Copyright 2019 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef API_RTPPARAMETERS_H_
+#define API_RTPPARAMETERS_H_
+
+// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
+// been updated to include the new path.
+
+#include "api/rtp_parameters.h"
+
+#endif  // API_RTPPARAMETERS_H_

api/rtpreceiverinterface.h

@@ -0,0 +1,19 @@
+/*
+ *  Copyright 2019 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef API_RTPRECEIVERINTERFACE_H_
+#define API_RTPRECEIVERINTERFACE_H_
+
+// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
+// been updated to include the new path.
+
+#include "api/rtp_receiver_interface.h"
+
+#endif  // API_RTPRECEIVERINTERFACE_H_

api/rtpsenderinterface.h

@@ -0,0 +1,19 @@
+/*
+ *  Copyright 2019 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef API_RTPSENDERINTERFACE_H_
+#define API_RTPSENDERINTERFACE_H_
+
+// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
+// been updated to include the new path.
+
+#include "api/rtp_sender_interface.h"
+
+#endif  // API_RTPSENDERINTERFACE_H_

api/rtptransceiverinterface.h

@@ -0,0 +1,19 @@
+/*
+ *  Copyright 2019 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef API_RTPTRANSCEIVERINTERFACE_H_
+#define API_RTPTRANSCEIVERINTERFACE_H_
+
+// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
+// been updated to include the new path.
+
+#include "api/rtp_transceiver_interface.h"
+
+#endif  // API_RTPTRANSCEIVERINTERFACE_H_

api/setremotedescriptionobserverinterface.h

@@ -0,0 +1,19 @@
+/*
+ *  Copyright 2019 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef API_SETREMOTEDESCRIPTIONOBSERVERINTERFACE_H_
+#define API_SETREMOTEDESCRIPTIONOBSERVERINTERFACE_H_
+
+// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
+// been updated to include the new path.
+
+#include "api/set_remote_description_observer_interface.h"
+
+#endif  // API_SETREMOTEDESCRIPTIONOBSERVERINTERFACE_H_

api/stats/rtcstats.h

@@ -0,0 +1,19 @@
+/*
+ *  Copyright 2019 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef API_STATS_RTCSTATS_H_
+#define API_STATS_RTCSTATS_H_
+
+// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
+// been updated to include the new path.
+
+#include "api/stats/rtc_stats.h"
+
+#endif  // API_STATS_RTCSTATS_H_

api/stats/rtcstatscollectorcallback.h

@@ -0,0 +1,19 @@
+/*
+ *  Copyright 2019 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef API_STATS_RTCSTATSCOLLECTORCALLBACK_H_
+#define API_STATS_RTCSTATSCOLLECTORCALLBACK_H_
+
+// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
+// been updated to include the new path.
+
+#include "api/stats/rtc_stats_collector_callback.h"
+
+#endif  // API_STATS_RTCSTATSCOLLECTORCALLBACK_H_

api/stats/rtcstatsreport.h

@@ -0,0 +1,19 @@
+/*
+ *  Copyright 2019 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef API_STATS_RTCSTATSREPORT_H_
+#define API_STATS_RTCSTATSREPORT_H_
+
+// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
+// been updated to include the new path.
+
+#include "api/stats/rtc_stats_report.h"
+
+#endif  // API_STATS_RTCSTATSREPORT_H_

api/statstypes.h

@@ -0,0 +1,19 @@
+/*
+ *  Copyright 2019 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef API_STATSTYPES_H_
+#define API_STATSTYPES_H_
+
+// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
+// been updated to include the new path.
+
+#include "api/stats_types.h"
+
+#endif  // API_STATSTYPES_H_

api/test/fakeconstraints.h

@@ -0,0 +1,19 @@
+/*
+ *  Copyright 2019 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef API_TEST_FAKECONSTRAINTS_H_
+#define API_TEST_FAKECONSTRAINTS_H_
+
+// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
+// been updated to include the new path.
+
+#include "api/test/fake_constraints.h"
+
+#endif  // API_TEST_FAKECONSTRAINTS_H_

api/turncustomizer.h

@@ -0,0 +1,19 @@
+/*
+ *  Copyright 2019 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef API_TURNCUSTOMIZER_H_
+#define API_TURNCUSTOMIZER_H_
+
+// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
+// been updated to include the new path.
+
+#include "api/turn_customizer.h"
+
+#endif  // API_TURNCUSTOMIZER_H_

api/umametrics.h

@@ -0,0 +1,19 @@
+/*
+ *  Copyright 2019 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef API_UMAMETRICS_H_
+#define API_UMAMETRICS_H_
+
+// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
+// been updated to include the new path.
+
+#include "api/uma_metrics.h"
+
+#endif  // API_UMAMETRICS_H_

api/videosourceproxy.h

@@ -0,0 +1,19 @@
+/*
+ *  Copyright 2019 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef API_VIDEOSOURCEPROXY_H_
+#define API_VIDEOSOURCEPROXY_H_
+
+// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
+// been updated to include the new path.
+
+#include "api/video_track_source_proxy.h"
+
+#endif  // API_VIDEOSOURCEPROXY_H_

call/BUILD.gn

@@ -193,6 +193,7 @@ rtc_static_library("call") {
     "call.cc",
     "call_factory.cc",
     "call_factory.h",
+    "callfactory.h",
     "degraded_call.cc",
     "degraded_call.h",
     "flexfec_receive_stream_impl.cc",

call/callfactory.h

@@ -0,0 +1,19 @@
+/*
+ *  Copyright 2019 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef CALL_CALLFACTORY_H_
+#define CALL_CALLFACTORY_H_
+
+// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
+// been updated to include the new path.
+
+#include "call/call_factory.h"
+
+#endif  // CALL_CALLFACTORY_H_

examples/BUILD.gn

@@ -494,6 +494,7 @@ if (is_ios || (is_mac && target_cpu != "x86")) {
         "objcnativeapi/objc/NADViewController.mm",
         "objcnativeapi/objc/objc_call_client.h",
         "objcnativeapi/objc/objc_call_client.mm",
+        "objcnativeapi/objc/objccallclient.h",
       ]
 
       if (!build_with_chromium && is_clang) {
@@ -707,6 +708,7 @@ if (is_linux || is_win) {
     if (is_win) {
       sources += [
         "peerconnection/client/flag_defs.h",
+        "peerconnection/client/flagdefs.h",
         "peerconnection/client/main.cc",
         "peerconnection/client/main_wnd.cc",
         "peerconnection/client/main_wnd.h",
@@ -844,6 +846,7 @@ if (is_win || is_android) {
       sources += [
         "unityplugin/class_reference_holder.cc",
         "unityplugin/class_reference_holder.h",
+        "unityplugin/classreferenceholder.h",
         "unityplugin/jni_onload.cc",
       ]
       suppressed_configs += [ "//build/config/android:hide_all_but_jni_onload" ]

examples/androidnativeapi/BUILD.gn

@@ -39,6 +39,7 @@ if (is_android) {
     sources = [
       "jni/android_call_client.cc",
       "jni/android_call_client.h",
+      "jni/androidcallclient.h",
       "jni/onload.cc",
     ]
 

examples/androidnativeapi/jni/androidcallclient.h

@@ -0,0 +1,19 @@
+/*
+ *  Copyright 2019 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef EXAMPLES_ANDROIDNATIVEAPI_JNI_ANDROIDCALLCLIENT_H_
+#define EXAMPLES_ANDROIDNATIVEAPI_JNI_ANDROIDCALLCLIENT_H_
+
+// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
+// been updated to include the new path.
+
+#include "examples/androidnativeapi/jni/android_call_client.h"
+
+#endif  // EXAMPLES_ANDROIDNATIVEAPI_JNI_ANDROIDCALLCLIENT_H_

examples/objcnativeapi/objc/objccallclient.h

@@ -0,0 +1,19 @@
+/*
+ *  Copyright 2019 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef EXAMPLES_OBJCNATIVEAPI_OBJC_OBJCCALLCLIENT_H_
+#define EXAMPLES_OBJCNATIVEAPI_OBJC_OBJCCALLCLIENT_H_
+
+// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
+// been updated to include the new path.
+
+#include "examples/objcnativeapi/objc/objc_call_client.h"
+
+#endif  // EXAMPLES_OBJCNATIVEAPI_OBJC_OBJCCALLCLIENT_H_

examples/peerconnection/client/flagdefs.h

@@ -0,0 +1,19 @@
+/*
+ *  Copyright 2019 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef EXAMPLES_PEERCONNECTION_CLIENT_FLAGDEFS_H_
+#define EXAMPLES_PEERCONNECTION_CLIENT_FLAGDEFS_H_
+
+// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
+// been updated to include the new path.
+
+#include "examples/peerconnection/client/flag_defs.h"
+
+#endif  // EXAMPLES_PEERCONNECTION_CLIENT_FLAGDEFS_H_

examples/unityplugin/classreferenceholder.h

@@ -0,0 +1,19 @@
+/*
+ *  Copyright 2019 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef EXAMPLES_UNITYPLUGIN_CLASSREFERENCEHOLDER_H_
+#define EXAMPLES_UNITYPLUGIN_CLASSREFERENCEHOLDER_H_
+
+// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
+// been updated to include the new path.
+
+#include "examples/unityplugin/class_reference_holder.h"
+
+#endif  // EXAMPLES_UNITYPLUGIN_CLASSREFERENCEHOLDER_H_

logging/BUILD.gn

@@ -166,6 +166,7 @@ rtc_static_library("rtc_event_log_impl_encoder") {
     "rtc_event_log/encoder/rtc_event_log_encoder_common.h",
     "rtc_event_log/encoder/var_int.cc",
     "rtc_event_log/encoder/var_int.h",
+    "rtc_event_log/encoder/varint.h",
   ]
 
   defines = []
@@ -414,6 +415,7 @@ rtc_source_set("ice_log") {
     "rtc_event_log/events/rtc_event_ice_candidate_pair_config.h",
     "rtc_event_log/ice_logger.cc",
     "rtc_event_log/ice_logger.h",
+    "rtc_event_log/icelogger.h",
   ]
 
   deps = [

logging/rtc_event_log/encoder/varint.h

@@ -0,0 +1,19 @@
+/*
+ *  Copyright 2019 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef LOGGING_RTC_EVENT_LOG_ENCODER_VARINT_H_
+#define LOGGING_RTC_EVENT_LOG_ENCODER_VARINT_H_
+
+// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
+// been updated to include the new path.
+
+#include "logging/rtc_event_log/encoder/var_int.h"
+
+#endif  // LOGGING_RTC_EVENT_LOG_ENCODER_VARINT_H_

logging/rtc_event_log/icelogger.h

@@ -0,0 +1,19 @@
+/*
+ *  Copyright 2019 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef LOGGING_RTC_EVENT_LOG_ICELOGGER_H_
+#define LOGGING_RTC_EVENT_LOG_ICELOGGER_H_
+
+// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
+// been updated to include the new path.
+
+#include "logging/rtc_event_log/ice_logger.h"
+
+#endif  // LOGGING_RTC_EVENT_LOG_ICELOGGER_H_

media/BUILD.gn

@@ -52,6 +52,7 @@ rtc_source_set("rtc_media_config") {
   visibility = [ "*" ]
   sources = [
     "base/media_config.h",
+    "base/mediaconfig.h",
   ]
 }
 
@@ -87,7 +88,9 @@ rtc_static_library("rtc_media_base") {
   sources = [
     "base/adapted_video_track_source.cc",
     "base/adapted_video_track_source.h",
+    "base/adaptedvideotracksource.h",
     "base/audio_source.h",
+    "base/audiosource.h",
     "base/codec.cc",
     "base/codec.h",
     "base/device.h",
@@ -97,16 +100,24 @@ rtc_static_library("rtc_media_base") {
     "base/media_constants.h",
     "base/media_engine.cc",
     "base/media_engine.h",
+    "base/mediachannel.h",
+    "base/mediaconstants.h",
+    "base/mediaengine.h",
     "base/rid_description.cc",
     "base/rid_description.h",
+    "base/riddescription.h",
     "base/rtp_data_engine.cc",
     "base/rtp_data_engine.h",
     "base/rtp_utils.cc",
     "base/rtp_utils.h",
+    "base/rtpdataengine.h",
+    "base/rtputils.h",
     "base/stream_params.cc",
     "base/stream_params.h",
+    "base/streamparams.h",
     "base/turn_utils.cc",
     "base/turn_utils.h",
+    "base/turnutils.h",
     "base/video_adapter.cc",
     "base/video_adapter.h",
     "base/video_broadcaster.cc",
@@ -117,6 +128,11 @@ rtc_static_library("rtc_media_base") {
     "base/video_common.h",
     "base/video_source_base.cc",
     "base/video_source_base.h",
+    "base/videoadapter.h",
+    "base/videobroadcaster.h",
+    "base/videocapturer.h",
+    "base/videocommon.h",
+    "base/videosourcebase.h",
   ]
 
   if (!build_with_chromium && is_clang) {
@@ -238,18 +254,25 @@ rtc_static_library("rtc_internal_video_codecs") {
     "engine/internal_decoder_factory.h",
     "engine/internal_encoder_factory.cc",
     "engine/internal_encoder_factory.h",
+    "engine/internaldecoderfactory.h",
+    "engine/internalencoderfactory.h",
     "engine/multiplex_codec_factory.cc",
     "engine/multiplex_codec_factory.h",
+    "engine/multiplexcodecfactory.h",
     "engine/scoped_video_decoder.cc",
     "engine/scoped_video_decoder.h",
     "engine/scoped_video_encoder.cc",
     "engine/scoped_video_encoder.h",
+    "engine/scopedvideodecoder.h",
+    "engine/scopedvideoencoder.h",
 
     # TODO(bugs.webrtc.org/7925): stop exporting this header once downstream
     # targets depend on :rtc_encoder_simulcast_proxy directly.
     "engine/encoder_simulcast_proxy.h",
     "engine/webrtc_video_decoder_factory.h",
     "engine/webrtc_video_encoder_factory.h",
+    "engine/webrtcvideodecoderfactory.h",
+    "engine/webrtcvideoencoderfactory.h",
   ]
 
   if (!build_with_chromium && is_clang) {
@@ -312,6 +335,7 @@ rtc_static_library("rtc_audio_video") {
     "engine/apm_helpers.cc",
     "engine/apm_helpers.h",
     "engine/null_webrtc_video_engine.h",
+    "engine/nullwebrtcvideoengine.h",
     "engine/payload_type_mapper.cc",
     "engine/payload_type_mapper.h",
     "engine/simulcast.cc",
@@ -326,6 +350,11 @@ rtc_static_library("rtc_audio_video") {
     "engine/webrtc_video_engine.h",
     "engine/webrtc_voice_engine.cc",
     "engine/webrtc_voice_engine.h",
+    "engine/webrtcmediaengine.h",
+    "engine/webrtcvideodecoderfactory.h",
+    "engine/webrtcvideoencoderfactory.h",
+    "engine/webrtcvideoengine.h",
+    "engine/webrtcvoiceengine.h",
   ]
 
   if (!build_with_chromium && is_clang) {
@@ -399,6 +428,8 @@ rtc_static_library("rtc_data") {
       "sctp/sctp_transport.cc",
       "sctp/sctp_transport.h",
       "sctp/sctp_transport_internal.h",
+      "sctp/sctptransport.h",
+      "sctp/sctptransportinternal.h",
     ]
   } else {
     # libtool on mac does not like empty targets.
@@ -485,12 +516,21 @@ if (rtc_include_tests) {
       "base/fake_video_capturer.h",
       "base/fake_video_renderer.cc",
       "base/fake_video_renderer.h",
+      "base/fakeframesource.h",
+      "base/fakemediaengine.h",
+      "base/fakenetworkinterface.h",
+      "base/fakertp.h",
+      "base/fakevideocapturer.h",
+      "base/fakevideorenderer.h",
       "base/test_utils.cc",
       "base/test_utils.h",
+      "base/testutils.h",
       "engine/fake_webrtc_call.cc",
       "engine/fake_webrtc_call.h",
       "engine/fake_webrtc_video_engine.cc",
       "engine/fake_webrtc_video_engine.h",
+      "engine/fakewebrtccall.h",
+      "engine/fakewebrtcvideoengine.h",
     ]
 
     if (!build_with_chromium && is_clang) {

media/base/adaptedvideotracksource.h

@@ -0,0 +1,19 @@
+/*
+ *  Copyright 2019 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef MEDIA_BASE_ADAPTEDVIDEOTRACKSOURCE_H_
+#define MEDIA_BASE_ADAPTEDVIDEOTRACKSOURCE_H_
+
+// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
+// been updated to include the new path.
+
+#include "media/base/adapted_video_track_source.h"
+
+#endif  // MEDIA_BASE_ADAPTEDVIDEOTRACKSOURCE_H_

media/base/audiosource.h

@@ -0,0 +1,19 @@
+/*
+ *  Copyright 2019 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef MEDIA_BASE_AUDIOSOURCE_H_
+#define MEDIA_BASE_AUDIOSOURCE_H_
+
+// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
+// been updated to include the new path.
+
+#include "media/base/audio_source.h"
+
+#endif  // MEDIA_BASE_AUDIOSOURCE_H_

media/base/fakeframesource.h

@@ -0,0 +1,19 @@
+/*
+ *  Copyright 2019 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef MEDIA_BASE_FAKEFRAMESOURCE_H_
+#define MEDIA_BASE_FAKEFRAMESOURCE_H_
+
+// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
+// been updated to include the new path.
+
+#include "media/base/fake_frame_source.h"
+
+#endif  // MEDIA_BASE_FAKEFRAMESOURCE_H_

media/base/fakemediaengine.h

@@ -0,0 +1,19 @@
+/*
+ *  Copyright 2019 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef MEDIA_BASE_FAKEMEDIAENGINE_H_
+#define MEDIA_BASE_FAKEMEDIAENGINE_H_
+
+// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
+// been updated to include the new path.
+
+#include "media/base/fake_media_engine.h"
+
+#endif  // MEDIA_BASE_FAKEMEDIAENGINE_H_

media/base/fakenetworkinterface.h

@@ -0,0 +1,19 @@
+/*
+ *  Copyright 2019 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef MEDIA_BASE_FAKENETWORKINTERFACE_H_
+#define MEDIA_BASE_FAKENETWORKINTERFACE_H_
+
+// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
+// been updated to include the new path.
+
+#include "media/base/fake_network_interface.h"
+
+#endif  // MEDIA_BASE_FAKENETWORKINTERFACE_H_

media/base/fakertp.h

@@ -0,0 +1,19 @@
+/*
+ *  Copyright 2019 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef MEDIA_BASE_FAKERTP_H_
+#define MEDIA_BASE_FAKERTP_H_
+
+// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
+// been updated to include the new path.
+
+#include "media/base/fake_rtp.h"
+
+#endif  // MEDIA_BASE_FAKERTP_H_

media/base/fakevideocapturer.h

@@ -0,0 +1,19 @@
+/*
+ *  Copyright 2019 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef MEDIA_BASE_FAKEVIDEOCAPTURER_H_
+#define MEDIA_BASE_FAKEVIDEOCAPTURER_H_
+
+// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
+// been updated to include the new path.
+
+#include "media/base/fake_video_capturer.h"
+
+#endif  // MEDIA_BASE_FAKEVIDEOCAPTURER_H_

media/base/fakevideorenderer.h

@@ -0,0 +1,19 @@
+/*
+ *  Copyright 2019 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef MEDIA_BASE_FAKEVIDEORENDERER_H_
+#define MEDIA_BASE_FAKEVIDEORENDERER_H_
+
+// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
+// been updated to include the new path.
+
+#include "media/base/fake_video_renderer.h"
+
+#endif  // MEDIA_BASE_FAKEVIDEORENDERER_H_

media/base/mediachannel.h

@@ -0,0 +1,19 @@
+/*
+ *  Copyright 2019 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef MEDIA_BASE_MEDIACHANNEL_H_
+#define MEDIA_BASE_MEDIACHANNEL_H_
+
+// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
+// been updated to include the new path.
+
+#include "media/base/media_channel.h"
+
+#endif  // MEDIA_BASE_MEDIACHANNEL_H_

media/base/mediaconfig.h

@@ -0,0 +1,19 @@
+/*
+ *  Copyright 2019 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef MEDIA_BASE_MEDIACONFIG_H_
+#define MEDIA_BASE_MEDIACONFIG_H_
+
+// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
+// been updated to include the new path.
+
+#include "media/base/media_config.h"
+
+#endif  // MEDIA_BASE_MEDIACONFIG_H_

media/base/mediaconstants.h

@@ -0,0 +1,19 @@
+/*
+ *  Copyright 2019 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef MEDIA_BASE_MEDIACONSTANTS_H_
+#define MEDIA_BASE_MEDIACONSTANTS_H_
+
+// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
+// been updated to include the new path.
+
+#include "media/base/media_constants.h"
+
+#endif  // MEDIA_BASE_MEDIACONSTANTS_H_

media/base/mediaengine.h

@@ -0,0 +1,19 @@
+/*
+ *  Copyright 2019 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef MEDIA_BASE_MEDIAENGINE_H_
+#define MEDIA_BASE_MEDIAENGINE_H_
+
+// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
+// been updated to include the new path.
+
+#include "media/base/media_engine.h"
+
+#endif  // MEDIA_BASE_MEDIAENGINE_H_

media/base/riddescription.h

@@ -0,0 +1,19 @@
+/*
+ *  Copyright 2019 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef MEDIA_BASE_RIDDESCRIPTION_H_
+#define MEDIA_BASE_RIDDESCRIPTION_H_
+
+// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
+// been updated to include the new path.
+
+#include "media/base/rid_description.h"
+
+#endif  // MEDIA_BASE_RIDDESCRIPTION_H_

media/base/rtpdataengine.h

@@ -0,0 +1,19 @@
+/*
+ *  Copyright 2019 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef MEDIA_BASE_RTPDATAENGINE_H_
+#define MEDIA_BASE_RTPDATAENGINE_H_
+
+// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
+// been updated to include the new path.
+
+#include "media/base/rtp_data_engine.h"
+
+#endif  // MEDIA_BASE_RTPDATAENGINE_H_

media/base/rtputils.h

@@ -0,0 +1,19 @@
+/*
+ *  Copyright 2019 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef MEDIA_BASE_RTPUTILS_H_
+#define MEDIA_BASE_RTPUTILS_H_
+
+// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
+// been updated to include the new path.
+
+#include "media/base/rtp_utils.h"
+
+#endif  // MEDIA_BASE_RTPUTILS_H_

media/base/streamparams.h

@@ -0,0 +1,19 @@
+/*
+ *  Copyright 2019 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef MEDIA_BASE_STREAMPARAMS_H_
+#define MEDIA_BASE_STREAMPARAMS_H_
+
+// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
+// been updated to include the new path.
+
+#include "media/base/stream_params.h"
+
+#endif  // MEDIA_BASE_STREAMPARAMS_H_

media/base/testutils.h

@@ -0,0 +1,19 @@
+/*
+ *  Copyright 2019 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef MEDIA_BASE_TESTUTILS_H_
+#define MEDIA_BASE_TESTUTILS_H_
+
+// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
+// been updated to include the new path.
+
+#include "media/base/test_utils.h"
+
+#endif  // MEDIA_BASE_TESTUTILS_H_

media/base/turnutils.h

@@ -0,0 +1,19 @@
+/*
+ *  Copyright 2019 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef MEDIA_BASE_TURNUTILS_H_
+#define MEDIA_BASE_TURNUTILS_H_
+
+// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
+// been updated to include the new path.
+
+#include "media/base/turn_utils.h"
+
+#endif  // MEDIA_BASE_TURNUTILS_H_

media/base/videoadapter.h

@@ -0,0 +1,19 @@
+/*
+ *  Copyright 2019 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef MEDIA_BASE_VIDEOADAPTER_H_
+#define MEDIA_BASE_VIDEOADAPTER_H_
+
+// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
+// been updated to include the new path.
+
+#include "media/base/video_adapter.h"
+
+#endif  // MEDIA_BASE_VIDEOADAPTER_H_

media/base/videobroadcaster.h

@@ -0,0 +1,19 @@
+/*
+ *  Copyright 2019 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef MEDIA_BASE_VIDEOBROADCASTER_H_
+#define MEDIA_BASE_VIDEOBROADCASTER_H_
+
+// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
+// been updated to include the new path.
+
+#include "media/base/video_broadcaster.h"
+
+#endif  // MEDIA_BASE_VIDEOBROADCASTER_H_

media/base/videocapturer.h

@@ -0,0 +1,19 @@
+/*
+ *  Copyright 2019 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef MEDIA_BASE_VIDEOCAPTURER_H_
+#define MEDIA_BASE_VIDEOCAPTURER_H_
+
+// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
+// been updated to include the new path.
+
+#include "media/base/video_capturer.h"
+
+#endif  // MEDIA_BASE_VIDEOCAPTURER_H_

media/base/videocommon.h

@@ -0,0 +1,19 @@
+/*
+ *  Copyright 2019 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef MEDIA_BASE_VIDEOCOMMON_H_
+#define MEDIA_BASE_VIDEOCOMMON_H_
+
+// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
+// been updated to include the new path.
+
+#include "media/base/video_common.h"
+
+#endif  // MEDIA_BASE_VIDEOCOMMON_H_

media/base/videosourcebase.h

@@ -0,0 +1,19 @@
+/*
+ *  Copyright 2019 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef MEDIA_BASE_VIDEOSOURCEBASE_H_
+#define MEDIA_BASE_VIDEOSOURCEBASE_H_
+
+// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
+// been updated to include the new path.
+
+#include "media/base/video_source_base.h"
+
+#endif  // MEDIA_BASE_VIDEOSOURCEBASE_H_

media/engine/fakewebrtccall.h

@@ -0,0 +1,19 @@
+/*
+ *  Copyright 2019 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef MEDIA_ENGINE_FAKEWEBRTCCALL_H_
+#define MEDIA_ENGINE_FAKEWEBRTCCALL_H_
+
+// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
+// been updated to include the new path.
+
+#include "media/engine/fake_webrtc_call.h"
+
+#endif  // MEDIA_ENGINE_FAKEWEBRTCCALL_H_

media/engine/fakewebrtcvideoengine.h

@@ -0,0 +1,19 @@
+/*
+ *  Copyright 2019 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef MEDIA_ENGINE_FAKEWEBRTCVIDEOENGINE_H_
+#define MEDIA_ENGINE_FAKEWEBRTCVIDEOENGINE_H_
+
+// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
+// been updated to include the new path.
+
+#include "media/engine/fake_webrtc_video_engine.h"
+
+#endif  // MEDIA_ENGINE_FAKEWEBRTCVIDEOENGINE_H_

media/engine/internaldecoderfactory.h

@@ -0,0 +1,19 @@
+/*
+ *  Copyright 2019 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef MEDIA_ENGINE_INTERNALDECODERFACTORY_H_
+#define MEDIA_ENGINE_INTERNALDECODERFACTORY_H_
+
+// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
+// been updated to include the new path.
+
+#include "media/engine/internal_decoder_factory.h"
+
+#endif  // MEDIA_ENGINE_INTERNALDECODERFACTORY_H_

media/engine/internalencoderfactory.h

@@ -0,0 +1,19 @@
+/*
+ *  Copyright 2019 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef MEDIA_ENGINE_INTERNALENCODERFACTORY_H_
+#define MEDIA_ENGINE_INTERNALENCODERFACTORY_H_
+
+// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
+// been updated to include the new path.
+
+#include "media/engine/internal_encoder_factory.h"
+
+#endif  // MEDIA_ENGINE_INTERNALENCODERFACTORY_H_

media/engine/multiplexcodecfactory.h

@@ -0,0 +1,19 @@
+/*
+ *  Copyright 2019 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef MEDIA_ENGINE_MULTIPLEXCODECFACTORY_H_
+#define MEDIA_ENGINE_MULTIPLEXCODECFACTORY_H_
+
+// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
+// been updated to include the new path.
+
+#include "media/engine/multiplex_codec_factory.h"
+
+#endif  // MEDIA_ENGINE_MULTIPLEXCODECFACTORY_H_

media/engine/nullwebrtcvideoengine.h

@@ -0,0 +1,19 @@
+/*
+ *  Copyright 2019 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef MEDIA_ENGINE_NULLWEBRTCVIDEOENGINE_H_
+#define MEDIA_ENGINE_NULLWEBRTCVIDEOENGINE_H_
+
+// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
+// been updated to include the new path.
+
+#include "media/engine/null_webrtc_video_engine.h"
+
+#endif  // MEDIA_ENGINE_NULLWEBRTCVIDEOENGINE_H_

media/engine/scopedvideodecoder.h

@@ -0,0 +1,19 @@
+/*
+ *  Copyright 2019 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef MEDIA_ENGINE_SCOPEDVIDEODECODER_H_
+#define MEDIA_ENGINE_SCOPEDVIDEODECODER_H_
+
+// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
+// been updated to include the new path.
+
+#include "media/engine/scoped_video_decoder.h"
+
+#endif  // MEDIA_ENGINE_SCOPEDVIDEODECODER_H_

media/engine/scopedvideoencoder.h

@@ -0,0 +1,19 @@
+/*
+ *  Copyright 2019 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef MEDIA_ENGINE_SCOPEDVIDEOENCODER_H_
+#define MEDIA_ENGINE_SCOPEDVIDEOENCODER_H_
+
+// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
+// been updated to include the new path.
+
+#include "media/engine/scoped_video_encoder.h"
+
+#endif  // MEDIA_ENGINE_SCOPEDVIDEOENCODER_H_

media/engine/webrtcmediaengine.h

@@ -0,0 +1,19 @@
+/*
+ *  Copyright 2019 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef MEDIA_ENGINE_WEBRTCMEDIAENGINE_H_
+#define MEDIA_ENGINE_WEBRTCMEDIAENGINE_H_
+
+// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
+// been updated to include the new path.
+
+#include "media/engine/webrtc_media_engine.h"
+
+#endif  // MEDIA_ENGINE_WEBRTCMEDIAENGINE_H_

media/engine/webrtcvideodecoderfactory.h

@@ -0,0 +1,19 @@
+/*
+ *  Copyright 2019 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef MEDIA_ENGINE_WEBRTCVIDEODECODERFACTORY_H_
+#define MEDIA_ENGINE_WEBRTCVIDEODECODERFACTORY_H_
+
+// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
+// been updated to include the new path.
+
+#include "media/engine/webrtc_video_decoder_factory.h"
+
+#endif  // MEDIA_ENGINE_WEBRTCVIDEODECODERFACTORY_H_

media/engine/webrtcvideoencoderfactory.h

@@ -0,0 +1,19 @@
+/*
+ *  Copyright 2019 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef MEDIA_ENGINE_WEBRTCVIDEOENCODERFACTORY_H_
+#define MEDIA_ENGINE_WEBRTCVIDEOENCODERFACTORY_H_
+
+// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
+// been updated to include the new path.
+
+#include "media/engine/webrtc_video_encoder_factory.h"
+
+#endif  // MEDIA_ENGINE_WEBRTCVIDEOENCODERFACTORY_H_

media/engine/webrtcvideoengine.h

@@ -0,0 +1,19 @@
+/*
+ *  Copyright 2019 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef MEDIA_ENGINE_WEBRTCVIDEOENGINE_H_
+#define MEDIA_ENGINE_WEBRTCVIDEOENGINE_H_
+
+// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
+// been updated to include the new path.
+
+#include "media/engine/webrtc_video_engine.h"
+
+#endif  // MEDIA_ENGINE_WEBRTCVIDEOENGINE_H_

media/engine/webrtcvoiceengine.h

@@ -0,0 +1,19 @@
+/*
+ *  Copyright 2019 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef MEDIA_ENGINE_WEBRTCVOICEENGINE_H_
+#define MEDIA_ENGINE_WEBRTCVOICEENGINE_H_
+
+// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
+// been updated to include the new path.
+
+#include "media/engine/webrtc_voice_engine.h"
+
+#endif  // MEDIA_ENGINE_WEBRTCVOICEENGINE_H_

media/sctp/sctptransport.h

@@ -0,0 +1,19 @@
+/*
+ *  Copyright 2019 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef MEDIA_SCTP_SCTPTRANSPORT_H_
+#define MEDIA_SCTP_SCTPTRANSPORT_H_
+
+// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
+// been updated to include the new path.
+
+#include "media/sctp/sctp_transport.h"
+
+#endif  // MEDIA_SCTP_SCTPTRANSPORT_H_

media/sctp/sctptransportinternal.h

@@ -0,0 +1,19 @@
+/*
+ *  Copyright 2019 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef MEDIA_SCTP_SCTPTRANSPORTINTERNAL_H_
+#define MEDIA_SCTP_SCTPTRANSPORTINTERNAL_H_
+
+// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
+// been updated to include the new path.
+
+#include "media/sctp/sctp_transport_internal.h"
+
+#endif  // MEDIA_SCTP_SCTPTRANSPORTINTERNAL_H_

p2p/BUILD.gn

@@ -20,25 +20,35 @@ rtc_static_library("rtc_p2p") {
   sources = [
     "base/async_stun_tcp_socket.cc",
     "base/async_stun_tcp_socket.h",
+    "base/asyncstuntcpsocket.h",
     "base/basic_async_resolver_factory.cc",
     "base/basic_async_resolver_factory.h",
     "base/basic_packet_socket_factory.cc",
     "base/basic_packet_socket_factory.h",
+    "base/basicasyncresolverfactory.h",
+    "base/basicpacketsocketfactory.h",
     "base/candidate_pair_interface.h",
+    "base/candidatepairinterface.h",
     "base/dtls_transport.cc",
     "base/dtls_transport.h",
     "base/dtls_transport_internal.cc",
     "base/dtls_transport_internal.h",
+    "base/dtlstransport.h",
+    "base/dtlstransportinternal.h",
     "base/ice_credentials_iterator.cc",
     "base/ice_credentials_iterator.h",
     "base/ice_transport_internal.cc",
     "base/ice_transport_internal.h",
+    "base/icecredentialsiterator.h",
+    "base/icetransportinternal.h",
     "base/mdns_message.cc",
     "base/mdns_message.h",
     "base/p2p_constants.cc",
     "base/p2p_constants.h",
     "base/p2p_transport_channel.cc",
     "base/p2p_transport_channel.h",
+    "base/p2pconstants.h",
+    "base/p2ptransportchannel.h",
     "base/packet_loss_estimator.cc",
     "base/packet_loss_estimator.h",
     "base/packet_socket_factory.cc",
@@ -46,26 +56,38 @@ rtc_static_library("rtc_p2p") {
     "base/packet_transport_interface.h",
     "base/packet_transport_internal.cc",
     "base/packet_transport_internal.h",
+    "base/packetlossestimator.h",
+    "base/packetsocketfactory.h",
+    "base/packettransportinterface.h",
+    "base/packettransportinternal.h",
     "base/port.cc",
     "base/port.h",
     "base/port_allocator.cc",
     "base/port_allocator.h",
     "base/port_interface.cc",
     "base/port_interface.h",
+    "base/portallocator.h",
+    "base/portinterface.h",
     "base/pseudo_tcp.cc",
     "base/pseudo_tcp.h",
+    "base/pseudotcp.h",
     "base/regathering_controller.cc",
     "base/regathering_controller.h",
+    "base/regatheringcontroller.h",
     "base/relay_port.cc",
     "base/relay_port.h",
+    "base/relayport.h",
     "base/stun.cc",
     "base/stun.h",
     "base/stun_port.cc",
     "base/stun_port.h",
     "base/stun_request.cc",
     "base/stun_request.h",
+    "base/stunport.h",
+    "base/stunrequest.h",
     "base/tcp_port.cc",
     "base/tcp_port.h",
+    "base/tcpport.h",
     "base/transport.h",
     "base/transport_description.cc",
     "base/transport_description.h",
@@ -73,14 +95,23 @@ rtc_static_library("rtc_p2p") {
     "base/transport_description_factory.h",
     "base/transport_factory_interface.h",
     "base/transport_info.h",
+    "base/transportdescription.h",
+    "base/transportdescriptionfactory.h",
+    "base/transportfactoryinterface.h",
+    "base/transportinfo.h",
     "base/turn_port.cc",
     "base/turn_port.h",
+    "base/turnport.h",
     "base/udp_port.h",
+    "base/udpport.h",
     "client/basic_port_allocator.cc",
     "client/basic_port_allocator.h",
+    "client/basicportallocator.h",
     "client/relay_port_factory_interface.h",
+    "client/relayportfactoryinterface.h",
     "client/turn_port_factory.cc",
     "client/turn_port_factory.h",
+    "client/turnportfactory.h",
   ]
 
   deps = [
@@ -120,13 +151,24 @@ if (rtc_include_tests) {
       "base/fake_ice_transport.h",
       "base/fake_packet_transport.h",
       "base/fake_port_allocator.h",
+      "base/fakecandidatepair.h",
+      "base/fakedtlstransport.h",
+      "base/fakeicetransport.h",
+      "base/fakepackettransport.h",
+      "base/fakeportallocator.h",
       "base/mock_async_resolver.h",
       "base/mock_ice_transport.h",
+      "base/mockasyncresolver.h",
+      "base/mockicetransport.h",
       "base/test_relay_server.h",
       "base/test_stun_server.cc",
       "base/test_stun_server.h",
       "base/test_turn_customizer.h",
       "base/test_turn_server.h",
+      "base/testrelayserver.h",
+      "base/teststunserver.h",
+      "base/testturncustomizer.h",
+      "base/testturnserver.h",
     ]
     deps = [
       ":p2p_server_utils",
@@ -203,10 +245,13 @@ rtc_source_set("p2p_server_utils") {
   sources = [
     "base/relay_server.cc",
     "base/relay_server.h",
+    "base/relayserver.h",
     "base/stun_server.cc",
     "base/stun_server.h",
+    "base/stunserver.h",
     "base/turn_server.cc",
     "base/turn_server.h",
+    "base/turnserver.h",
   ]
   deps = [
     ":rtc_p2p",
@@ -223,6 +268,7 @@ rtc_static_library("libstunprober") {
   sources = [
     "stunprober/stun_prober.cc",
     "stunprober/stun_prober.h",
+    "stunprober/stunprober.h",
   ]
 
   deps = [

p2p/base/asyncstuntcpsocket.h

@@ -0,0 +1,19 @@
+/*
+ *  Copyright 2019 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef P2P_BASE_ASYNCSTUNTCPSOCKET_H_
+#define P2P_BASE_ASYNCSTUNTCPSOCKET_H_
+
+// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
+// been updated to include the new path.
+
+#include "p2p/base/async_stun_tcp_socket.h"
+
+#endif  // P2P_BASE_ASYNCSTUNTCPSOCKET_H_

p2p/base/basicasyncresolverfactory.h

@@ -0,0 +1,19 @@
+/*
+ *  Copyright 2019 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef P2P_BASE_BASICASYNCRESOLVERFACTORY_H_
+#define P2P_BASE_BASICASYNCRESOLVERFACTORY_H_
+
+// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
+// been updated to include the new path.
+
+#include "p2p/base/basic_async_resolver_factory.h"
+
+#endif  // P2P_BASE_BASICASYNCRESOLVERFACTORY_H_

p2p/base/basicpacketsocketfactory.h

@@ -0,0 +1,19 @@
+/*
+ *  Copyright 2019 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef P2P_BASE_BASICPACKETSOCKETFACTORY_H_
+#define P2P_BASE_BASICPACKETSOCKETFACTORY_H_
+
+// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
+// been updated to include the new path.
+
+#include "p2p/base/basic_packet_socket_factory.h"
+
+#endif  // P2P_BASE_BASICPACKETSOCKETFACTORY_H_

p2p/base/candidatepairinterface.h

@@ -0,0 +1,19 @@
+/*
+ *  Copyright 2019 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef P2P_BASE_CANDIDATEPAIRINTERFACE_H_
+#define P2P_BASE_CANDIDATEPAIRINTERFACE_H_
+
+// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
+// been updated to include the new path.
+
+#include "p2p/base/candidate_pair_interface.h"
+
+#endif  // P2P_BASE_CANDIDATEPAIRINTERFACE_H_

p2p/base/dtlstransport.h

@@ -0,0 +1,19 @@
+/*
+ *  Copyright 2019 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef P2P_BASE_DTLSTRANSPORT_H_
+#define P2P_BASE_DTLSTRANSPORT_H_
+
+// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
+// been updated to include the new path.
+
+#include "p2p/base/dtls_transport.h"
+
+#endif  // P2P_BASE_DTLSTRANSPORT_H_

p2p/base/dtlstransportinternal.h

@@ -0,0 +1,19 @@
+/*
+ *  Copyright 2019 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef P2P_BASE_DTLSTRANSPORTINTERNAL_H_
+#define P2P_BASE_DTLSTRANSPORTINTERNAL_H_
+
+// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
+// been updated to include the new path.
+
+#include "p2p/base/dtls_transport_internal.h"
+
+#endif  // P2P_BASE_DTLSTRANSPORTINTERNAL_H_

p2p/base/fakecandidatepair.h

@@ -0,0 +1,19 @@
+/*
+ *  Copyright 2019 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef P2P_BASE_FAKECANDIDATEPAIR_H_
+#define P2P_BASE_FAKECANDIDATEPAIR_H_
+
+// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
+// been updated to include the new path.
+
+#include "p2p/base/fake_candidate_pair.h"
+
+#endif  // P2P_BASE_FAKECANDIDATEPAIR_H_

p2p/base/fakedtlstransport.h

@@ -0,0 +1,19 @@
+/*
+ *  Copyright 2019 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef P2P_BASE_FAKEDTLSTRANSPORT_H_
+#define P2P_BASE_FAKEDTLSTRANSPORT_H_
+
+// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
+// been updated to include the new path.
+
+#include "p2p/base/fake_dtls_transport.h"
+
+#endif  // P2P_BASE_FAKEDTLSTRANSPORT_H_

p2p/base/fakeicetransport.h

@@ -0,0 +1,19 @@
+/*
+ *  Copyright 2019 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef P2P_BASE_FAKEICETRANSPORT_H_
+#define P2P_BASE_FAKEICETRANSPORT_H_
+
+// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
+// been updated to include the new path.
+
+#include "p2p/base/fake_ice_transport.h"
+
+#endif  // P2P_BASE_FAKEICETRANSPORT_H_

p2p/base/fakepackettransport.h

@@ -0,0 +1,19 @@
+/*
+ *  Copyright 2019 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef P2P_BASE_FAKEPACKETTRANSPORT_H_
+#define P2P_BASE_FAKEPACKETTRANSPORT_H_
+
+// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
+// been updated to include the new path.
+
+#include "p2p/base/fake_packet_transport.h"
+
+#endif  // P2P_BASE_FAKEPACKETTRANSPORT_H_