Commit 5f427823 authored by Henrik Kjellander's avatar Henrik Kjellander Committed by Commit Bot

Update includes for webrtc/{base => rtc_base} rename.

Update all Chromium references to match WebRTC's base->rtc_base rename.

Rename third_party/webrtc_overrides/webrtc/{base => rtc_base}.

NOTICE: This CL leaves copies of the following files in
third_party/webrtc_overrides/webrtc/base around during transition:
* logging.cc
* task_queue.cc
* win32socketinit.cc
This is needed to avoid breaking the build since they're referenced from
WebRTC's webrtc/rtc_base/BUILD.gn (really shouldn't be). These copies
obviously needs to be cleaned up asap.

BUG=webrtc:7634
TBR=wfh@chromium.org

Change-Id: Ia6a97042ec270b9e4fa94baf7a8dd3150c407358
Reviewed-on: https://chromium-review.googlesource.com/554730
Commit-Queue: Henrik Kjellander <kjellander@chromium.org>
Reviewed-by: default avatarSergey Ulanov <sergeyu@chromium.org>
Reviewed-by: default avatarJochen Eisinger <jochen@chromium.org>
Cr-Commit-Position: refs/heads/master@{#483662}
parent d84a9afa
......@@ -1640,7 +1640,7 @@ source_set("browser") {
deps += [
"//jingle:jingle_glue",
"//third_party/webrtc/base:rtc_base",
"//third_party/webrtc/rtc_base:rtc_base",
"//third_party/webrtc/media:rtc_media_base",
"//third_party/webrtc/modules/desktop_capture:primitives",
"//third_party/webrtc_overrides:init_webrtc",
......
......@@ -6,8 +6,8 @@
#include <utility>
#include "third_party/webrtc/base/ratelimiter.h"
#include "third_party/webrtc/base/timeutils.h"
#include "third_party/webrtc/rtc_base/ratelimiter.h"
#include "third_party/webrtc/rtc_base/timeutils.h"
namespace content {
......
......@@ -24,7 +24,7 @@
#include "net/base/ip_endpoint.h"
#include "net/socket/diff_serv_code_point.h"
#include "net/socket/udp_server_socket.h"
#include "third_party/webrtc/base/asyncpacketsocket.h"
#include "third_party/webrtc/rtc_base/asyncpacketsocket.h"
namespace content {
......
......@@ -422,7 +422,7 @@ source_set("common") {
"//storage/common",
"//third_party/boringssl",
"//third_party/icu",
"//third_party/webrtc/base:rtc_base",
"//third_party/webrtc/rtc_base:rtc_base",
"//third_party/webrtc_overrides",
"//ui/accessibility",
"//ui/base",
......
......@@ -13,7 +13,7 @@
#include "ipc/ipc_message_macros.h"
#include "net/base/ip_address.h"
#include "net/base/network_interfaces.h"
#include "third_party/webrtc/base/asyncpacketsocket.h"
#include "third_party/webrtc/rtc_base/asyncpacketsocket.h"
#undef IPC_MESSAGE_EXPORT
#define IPC_MESSAGE_EXPORT CONTENT_EXPORT
......
......@@ -768,7 +768,7 @@ target(link_target_type, "renderer") {
"//third_party/webrtc/api:video_frame_api",
"//third_party/webrtc/api/audio_codecs:builtin_audio_decoder_factory",
"//third_party/webrtc/api/audio_codecs:builtin_audio_encoder_factory",
"//third_party/webrtc/base:rtc_base",
"//third_party/webrtc/rtc_base:rtc_base",
"//third_party/webrtc/media:rtc_media",
"//third_party/webrtc/media:rtc_media_base",
"//third_party/webrtc/modules/audio_device",
......
......@@ -19,9 +19,9 @@
#include "media/renderers/gpu_video_accelerator_factories.h"
#include "third_party/skia/include/core/SkBitmap.h"
#include "third_party/webrtc/api/video/video_frame.h"
#include "third_party/webrtc/base/bind.h"
#include "third_party/webrtc/base/refcount.h"
#include "third_party/webrtc/modules/video_coding/codecs/h264/include/h264.h"
#include "third_party/webrtc/rtc_base/bind.h"
#include "third_party/webrtc/rtc_base/refcount.h"
#if defined(OS_WIN)
#include "base/command_line.h"
......
......@@ -31,7 +31,7 @@
#include "media/renderers/gpu_video_accelerator_factories.h"
#include "media/video/video_encode_accelerator.h"
#include "third_party/libyuv/include/libyuv.h"
#include "third_party/webrtc/base/timeutils.h"
#include "third_party/webrtc/rtc_base/timeutils.h"
namespace content {
......
......@@ -14,7 +14,7 @@
#include "content/renderer/media/video_track_adapter.h"
#include "media/capture/video_capture_types.h"
#include "third_party/WebKit/public/platform/WebMediaConstraints.h"
#include "third_party/webrtc/base/optional.h"
#include "third_party/webrtc/rtc_base/optional.h"
namespace content {
......
......@@ -9,7 +9,7 @@
#include "content/common/content_export.h"
#include "content/renderer/media/media_stream_constraints_util.h"
#include "third_party/webrtc/base/optional.h"
#include "third_party/webrtc/rtc_base/optional.h"
namespace blink {
class WebMediaConstraints;
......
......@@ -12,7 +12,7 @@
#include "content/renderer/media/mock_data_channel_impl.h"
#include "content/renderer/media/webrtc/mock_peer_connection_dependency_factory.h"
#include "third_party/webrtc/api/rtpreceiverinterface.h"
#include "third_party/webrtc/base/refcountedobject.h"
#include "third_party/webrtc/rtc_base/refcountedobject.h"
using testing::_;
using webrtc::AudioTrackInterface;
......
......@@ -8,7 +8,7 @@
#include "base/memory/ptr_util.h"
#include "base/strings/string_util.h"
#include "third_party/webrtc/base/sslidentity.h"
#include "third_party/webrtc/rtc_base/sslidentity.h"
#include "url/gurl.h"
namespace content {
......
......@@ -11,8 +11,8 @@
#include "base/macros.h"
#include "content/common/content_export.h"
#include "third_party/WebKit/public/platform/WebRTCCertificate.h"
#include "third_party/webrtc/base/rtccertificate.h"
#include "third_party/webrtc/base/scoped_ref_ptr.h"
#include "third_party/webrtc/rtc_base/rtccertificate.h"
#include "third_party/webrtc/rtc_base/scoped_ref_ptr.h"
namespace content {
......
......@@ -16,9 +16,9 @@
#include "content/renderer/media/webrtc/peer_connection_dependency_factory.h"
#include "content/renderer/render_thread_impl.h"
#include "media/media_features.h"
#include "third_party/webrtc/base/rtccertificate.h"
#include "third_party/webrtc/base/rtccertificategenerator.h"
#include "third_party/webrtc/base/scoped_ref_ptr.h"
#include "third_party/webrtc/rtc_base/rtccertificate.h"
#include "third_party/webrtc/rtc_base/rtccertificategenerator.h"
#include "third_party/webrtc/rtc_base/scoped_ref_ptr.h"
#include "url/gurl.h"
namespace content {
......
......@@ -9,7 +9,7 @@
#include "third_party/WebKit/public/platform/WebRTCCertificate.h"
#include "third_party/WebKit/public/platform/WebRTCCertificateGenerator.h"
#include "third_party/WebKit/public/platform/WebRTCKeyParams.h"
#include "third_party/webrtc/base/optional.h"
#include "third_party/webrtc/rtc_base/optional.h"
namespace content {
......
......@@ -12,8 +12,8 @@
#include "content/renderer/media/webrtc/webrtc_video_capturer_adapter.h"
#include "third_party/WebKit/public/platform/WebMediaStreamTrack.h"
#include "third_party/webrtc/api/mediastreaminterface.h"
#include "third_party/webrtc/base/scoped_ref_ptr.h"
#include "third_party/webrtc/media/base/videocapturer.h"
#include "third_party/webrtc/rtc_base/scoped_ref_ptr.h"
using webrtc::AudioSourceInterface;
using webrtc::AudioTrackInterface;
......
......@@ -67,8 +67,8 @@
#include "third_party/webrtc/api/audio_codecs/builtin_audio_encoder_factory.h"
#include "third_party/webrtc/api/mediaconstraintsinterface.h"
#include "third_party/webrtc/api/videosourceproxy.h"
#include "third_party/webrtc/base/ssladapter.h"
#include "third_party/webrtc/modules/video_coding/codecs/h264/include/h264.h"
#include "third_party/webrtc/rtc_base/ssladapter.h"
#if defined(OS_ANDROID)
#include "media/base/android/media_codec_util.h"
......
......@@ -6,7 +6,7 @@
#include "base/logging.h"
#include "base/time/time.h"
#include "third_party/webrtc/base/scoped_ref_ptr.h"
#include "third_party/webrtc/rtc_base/scoped_ref_ptr.h"
namespace content {
......
......@@ -7,7 +7,7 @@
#include "base/logging.h"
#include "base/memory/ptr_util.h"
#include "content/renderer/media/webrtc/rtc_rtp_contributing_source.h"
#include "third_party/webrtc/base/scoped_ref_ptr.h"
#include "third_party/webrtc/rtc_base/scoped_ref_ptr.h"
namespace content {
......
......@@ -5,7 +5,7 @@
#include "content/renderer/media/webrtc/rtc_rtp_sender.h"
#include "base/logging.h"
#include "third_party/webrtc/base/scoped_ref_ptr.h"
#include "third_party/webrtc/rtc_base/scoped_ref_ptr.h"
namespace content {
......
......@@ -16,13 +16,13 @@
#include "base/strings/string_split.h"
#include "base/strings/stringprintf.h"
#include "base/time/time.h"
#include "third_party/webrtc/base/asyncpacketsocket.h"
#include "third_party/webrtc/base/asyncresolverinterface.h"
#include "third_party/webrtc/base/ipaddress.h"
#include "third_party/webrtc/base/network.h"
#include "third_party/webrtc/base/socketaddress.h"
#include "third_party/webrtc/base/thread.h"
#include "third_party/webrtc/p2p/base/packetsocketfactory.h"
#include "third_party/webrtc/rtc_base/asyncpacketsocket.h"
#include "third_party/webrtc/rtc_base/asyncresolverinterface.h"
#include "third_party/webrtc/rtc_base/ipaddress.h"
#include "third_party/webrtc/rtc_base/network.h"
#include "third_party/webrtc/rtc_base/socketaddress.h"
#include "third_party/webrtc/rtc_base/thread.h"
using stunprober::StunProber;
......
......@@ -16,9 +16,9 @@
#include "content/common/content_export.h"
#include "content/renderer/p2p/network_list_manager.h"
#include "content/renderer/p2p/network_list_observer.h"
#include "third_party/webrtc/base/network.h"
#include "third_party/webrtc/base/sigslot.h"
#include "third_party/webrtc/p2p/stunprober/stunprober.h"
#include "third_party/webrtc/rtc_base/network.h"
#include "third_party/webrtc/rtc_base/sigslot.h"
namespace rtc {
class PacketSocketFactory;
......
......@@ -5,7 +5,7 @@
#include "content/renderer/media/webrtc/stun_field_trial.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "third_party/webrtc/base/socketaddress.h"
#include "third_party/webrtc/rtc_base/socketaddress.h"
namespace content {
......
......@@ -6,7 +6,7 @@
#include "base/time/time.h"
#include "content/public/renderer/webrtc_log_message_delegate.h"
#include "third_party/webrtc_overrides/webrtc/base/logging.h"
#include "third_party/webrtc_overrides/webrtc/rtc_base/logging.h"
namespace content {
......
......@@ -9,8 +9,8 @@
#include "base/memory/weak_ptr.h"
#include "base/threading/thread_checker.h"
#include "content/common/content_export.h"
#include "third_party/webrtc/base/network.h"
#include "third_party/webrtc/base/sigslot.h"
#include "third_party/webrtc/rtc_base/network.h"
#include "third_party/webrtc/rtc_base/sigslot.h"
namespace rtc {
class IPAddress;
......
......@@ -11,8 +11,8 @@
#include "base/time/time.h"
#include "content/common/content_export.h"
#include "content/renderer/p2p/network_manager_uma.h"
#include "third_party/webrtc/base/network.h"
#include "third_party/webrtc/base/sigslot.h"
#include "third_party/webrtc/rtc_base/network.h"
#include "third_party/webrtc/rtc_base/sigslot.h"
#include "url/gurl.h"
namespace media {
......
......@@ -17,7 +17,7 @@
#include "content/renderer/p2p/empty_network_manager.h"
#include "media/base/media_permission.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "third_party/webrtc/base/ipaddress.h"
#include "third_party/webrtc/rtc_base/ipaddress.h"
using NetworkList = rtc::NetworkManager::NetworkList;
......
......@@ -14,7 +14,7 @@
#include "base/memory/ref_counted.h"
#include "content/common/content_export.h"
#include "net/base/ip_address.h"
#include "third_party/webrtc/base/asyncresolverinterface.h"
#include "third_party/webrtc/rtc_base/asyncresolverinterface.h"
namespace base {
class SingleThreadTaskRunner;
......
......@@ -17,7 +17,7 @@
#include "net/base/ip_address.h"
#include "net/base/network_change_notifier.h"
#include "net/base/network_interfaces.h"
#include "third_party/webrtc/base/socketaddress.h"
#include "third_party/webrtc/rtc_base/socketaddress.h"
namespace content {
......
......@@ -12,7 +12,7 @@
#include "content/common/content_export.h"
#include "content/renderer/p2p/network_list_manager.h"
#include "content/renderer/p2p/network_list_observer.h"
#include "third_party/webrtc/base/network.h"
#include "third_party/webrtc/rtc_base/network.h"
namespace net {
class IPAddress;
......
......@@ -26,7 +26,7 @@
#include "content/renderer/p2p/socket_dispatcher.h"
#include "jingle/glue/utils.h"
#include "net/base/ip_address.h"
#include "third_party/webrtc/base/asyncpacketsocket.h"
#include "third_party/webrtc/rtc_base/asyncpacketsocket.h"
namespace content {
......
......@@ -348,7 +348,7 @@ static_library("test_support") {
deps += [
"//third_party/webrtc/api:libjingle_peerconnection",
"//third_party/webrtc/api:rtc_stats_api",
"//third_party/webrtc/base:rtc_base_approved",
"//third_party/webrtc/rtc_base:rtc_base_approved",
"//third_party/webrtc/media:rtc_media_base",
"//third_party/webrtc/modules/video_capture",
"//third_party/webrtc/stats:rtc_stats",
......@@ -1696,7 +1696,7 @@ test("content_unittests") {
"//third_party/webrtc/api:rtc_stats_api",
"//third_party/webrtc/api:video_frame_api",
"//third_party/webrtc/api/video_codecs:video_codecs_api",
"//third_party/webrtc/base:rtc_base",
"//third_party/webrtc/rtc_base:rtc_base",
"//third_party/webrtc/media:rtc_media",
"//third_party/webrtc/modules/desktop_capture:primitives",
"//third_party/webrtc/modules/video_capture",
......
......@@ -52,7 +52,7 @@
#if BUILDFLAG(ENABLE_WEBRTC)
#include "content/renderer/media/rtc_certificate.h"
#include "third_party/webrtc/base/rtccertificate.h" // nogncheck
#include "third_party/webrtc/rtc_base/rtccertificate.h" // nogncheck
#endif
using blink::WebString;
......
......@@ -22,7 +22,7 @@
#include "net/socket/ssl_client_socket.h"
#include "net/socket/tcp_client_socket.h"
#include "net/ssl/ssl_config_service.h"
#include "third_party/webrtc/base/socketaddress.h"
#include "third_party/webrtc/rtc_base/socketaddress.h"
namespace jingle_glue {
......
......@@ -28,9 +28,9 @@
#include "net/ssl/ssl_config_service.h"
#include "net/url_request/url_request_context_getter.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "third_party/webrtc/base/ipaddress.h"
#include "third_party/webrtc/base/sigslot.h"
#include "third_party/webrtc/base/socketaddress.h"
#include "third_party/webrtc/rtc_base/ipaddress.h"
#include "third_party/webrtc/rtc_base/sigslot.h"
#include "third_party/webrtc/rtc_base/socketaddress.h"
namespace jingle_glue {
......
......@@ -8,7 +8,7 @@
#include <stddef.h>
#include "testing/gmock/include/gmock/gmock.h"
#include "third_party/webrtc/base/stream.h"
#include "third_party/webrtc/rtc_base/stream.h"
namespace jingle_glue {
......
......@@ -18,7 +18,7 @@
#define LOGGING_INSIDE_WEBRTC
#include "build/build_config.h"
#include "third_party/webrtc_overrides/webrtc/base/logging.h"
#include "third_party/webrtc_overrides/webrtc/rtc_base/logging.h"
#if defined(OS_WIN)
static const wchar_t* const log_file_name = L"libjingle_logging.log";
......
......@@ -13,7 +13,7 @@
#include "base/macros.h"
#include "base/threading/thread_local.h"
#include "base/trace_event/trace_event.h"
#include "third_party/webrtc/base/nullsocketserver.h"
#include "third_party/webrtc/rtc_base/nullsocketserver.h"
namespace jingle_glue {
......
......@@ -17,7 +17,7 @@
#include "base/single_thread_task_runner.h"
#include "base/synchronization/lock.h"
#include "base/synchronization/waitable_event.h"
#include "third_party/webrtc/base/thread.h"
#include "third_party/webrtc/rtc_base/thread.h"
namespace jingle_glue {
......
......@@ -14,9 +14,9 @@
#include "base/values.h"
#include "net/base/ip_address.h"
#include "net/base/ip_endpoint.h"
#include "third_party/webrtc/base/byteorder.h"
#include "third_party/webrtc/base/socketaddress.h"
#include "third_party/webrtc/p2p/base/candidate.h"
#include "third_party/webrtc/rtc_base/byteorder.h"
#include "third_party/webrtc/rtc_base/socketaddress.h"
namespace jingle_glue {
......
......@@ -7,7 +7,7 @@
#include <string>
#include "third_party/webrtc/base/ipaddress.h"
#include "third_party/webrtc/rtc_base/ipaddress.h"
namespace net {
class IPAddress;
......
include_rules = [
"+webrtc/base",
"+webrtc/rtc_base",
"+third_party/libjingle_xmpp/xmpp",
"+third_party/libjingle_xmpp/xmllite",
]
......@@ -10,7 +10,7 @@
#include "base/macros.h"
#include "third_party/libjingle_xmpp/xmpp/constants.h"
#include "third_party/libjingle_xmpp/xmpp/saslcookiemechanism.h"
#include "webrtc/base/socketaddress.h"
#include "webrtc/rtc_base/socketaddress.h"
namespace notifier {
......
......@@ -12,7 +12,7 @@
#include "jingle/glue/task_pump.h"
#include "testing/gmock/include/gmock/gmock.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "webrtc/base/sigslot.h"
#include "webrtc/rtc_base/sigslot.h"
namespace notifier {
......
......@@ -16,7 +16,7 @@
#include "base/sequence_checker.h"
#include "net/url_request/url_request_context_getter.h"
#include "third_party/libjingle_xmpp/xmpp/xmppengine.h"
#include "webrtc/base/sigslot.h"
#include "webrtc/rtc_base/sigslot.h"
namespace buzz {
class PreXmppAuth;
......
......@@ -11,7 +11,7 @@
#include <vector>
#include "jingle/notifier/base/server_information.h"
#include "webrtc/base/socketaddress.h"
#include "webrtc/rtc_base/socketaddress.h"
namespace buzz {
class XmppClientSettings;
......
......@@ -17,9 +17,9 @@
#include "third_party/libjingle_xmpp/xmpp/xmppclient.h"
#include "third_party/libjingle_xmpp/xmpp/xmppclientsettings.h"
#include "third_party/libjingle_xmpp/xmpp/xmppengine.h"
#include "webrtc/base/firewallsocketserver.h"
#include "webrtc/base/logging.h"
#include "webrtc/base/physicalsocketserver.h"
#include "webrtc/rtc_base/firewallsocketserver.h"
#include "webrtc/rtc_base/logging.h"
#include "webrtc/rtc_base/physicalsocketserver.h"
namespace notifier {
......
......@@ -9,7 +9,7 @@
#include "base/logging.h"
#include "jingle/notifier/base/server_information.h"
#include "net/cert/cert_verifier.h"
#include "webrtc/base/socketaddress.h"
#include "webrtc/rtc_base/socketaddress.h"
namespace notifier {
......
......@@ -9,7 +9,7 @@ include_rules = [
"+third_party/google_toolbox_for_mac/src",
"+third_party/libvpx",
"+third_party/libyuv",
"+third_party/webrtc/base",
"+third_party/webrtc/rtc_base",
"+third_party/webrtc/media",
"+third_party/webrtc/p2p",
"+third_party/webrtc/modules/desktop_capture",
......
......@@ -104,6 +104,6 @@ source_set("unit_tests") {
"//remoting/proto",
"//testing/gmock",
"//testing/gtest",
"//third_party/webrtc/base:rtc_base_approved",
"//third_party/webrtc/rtc_base:rtc_base_approved",
]
}
......@@ -35,7 +35,7 @@ source_set("display") {
deps = [
"//third_party/libyuv",
"//third_party/protobuf:protobuf_lite",
"//third_party/webrtc/base:rtc_base_approved",
"//third_party/webrtc/rtc_base:rtc_base_approved",
]
public_configs = [ "//third_party/khronos:khronos_headers" ]
......@@ -90,7 +90,7 @@ if (is_win) {
"//remoting/proto",
"//testing/gmock",
"//testing/gtest",
"//third_party/webrtc/base:rtc_base_approved",
"//third_party/webrtc/rtc_base:rtc_base_approved",
]
}
}
......@@ -29,7 +29,7 @@ source_set("input") {
":normalizing_input_filter",
"//remoting/base",
"//remoting/client/ui:ui_manipulation",
"//third_party/webrtc/base:rtc_base_approved",
"//third_party/webrtc/rtc_base:rtc_base_approved",
"//ui/events:dom_keycode_converter",
]
......@@ -54,7 +54,7 @@ source_set("normalizing_input_filter") {
deps = [
"//remoting/base",
"//third_party/webrtc/base:rtc_base_approved",
"//third_party/webrtc/rtc_base:rtc_base_approved",
"//third_party/webrtc/modules/desktop_capture:primitives",
"//ui/events:dom_keycode_converter",
]
......@@ -79,7 +79,7 @@ source_set("unit_tests") {
"//remoting/proto",
"//testing/gmock",
"//testing/gtest",
"//third_party/webrtc/base:rtc_base_approved",
"//third_party/webrtc/rtc_base:rtc_base_approved",
]
}
......@@ -104,6 +104,6 @@ source_set("normalizing_input_filter_unit_tests") {
"//remoting/proto",
"//testing/gmock",
"//testing/gtest",
"//third_party/webrtc/base:rtc_base_approved",
"//third_party/webrtc/rtc_base:rtc_base_approved",
]
}
......@@ -56,8 +56,8 @@
#include "remoting/protocol/host_stub.h"
#include "remoting/protocol/transport_context.h"
#include "remoting/signaling/delegating_signal_strategy.h"
#include "third_party/webrtc/base/helpers.h"
#include "third_party/webrtc/modules/desktop_capture/desktop_region.h"
#include "third_party/webrtc/rtc_base/helpers.h"
#include "url/gurl.h"
namespace remoting {
......
......@@ -10,7 +10,7 @@
#include "base/macros.h"
#include "ppapi/cpp/host_resolver.h"
#include "ppapi/utility/completion_callback_factory.h"
#include "third_party/webrtc/base/asyncresolverinterface.h"
#include "third_party/webrtc/rtc_base/asyncresolverinterface.h"
namespace remoting {
......
......@@ -14,7 +14,7 @@
#include "ppapi/cpp/net_address.h"
#include "ppapi/cpp/network_list.h"
#include "remoting/client/plugin/pepper_util.h"
#include "third_party/webrtc/base/socketaddress.h"
#include "third_party/webrtc/rtc_base/socketaddress.h"
namespace remoting {
......
......@@ -12,7 +12,7 @@
#include "ppapi/cpp/instance_handle.h"
#include "ppapi/cpp/network_monitor.h"
#include "ppapi/utility/completion_callback_factory.h"
#include "third_party/webrtc/base/network.h"
#include "third_party/webrtc/rtc_base/network.h"
namespace pp {
class NetworkList;
......
......@@ -17,8 +17,8 @@
#include "remoting/client/plugin/pepper_address_resolver.h"
#include "remoting/client/plugin/pepper_util.h"
#include "remoting/protocol/socket_util.h"
#include "third_party/webrtc/base/asyncpacketsocket.h"
#include "third_party/webrtc/base/nethelpers.h"
#include "third_party/webrtc/rtc_base/asyncpacketsocket.h"
#include "third_party/webrtc/rtc_base/nethelpers.h"
namespace remoting {
......
......@@ -10,7 +10,7 @@
#include "base/sys_byteorder.h"
#include "ppapi/cpp/module.h"
#include "ppapi/cpp/net_address.h"
#include "third_party/webrtc/base/socketaddress.h"
#include "third_party/webrtc/rtc_base/socketaddress.h"
namespace remoting {
......
......@@ -17,7 +17,7 @@ source_set("ui") {
public_deps = [
"//remoting/proto",
"//third_party/webrtc/base:rtc_base_approved",
"//third_party/webrtc/rtc_base:rtc_base_approved",