From 0072511073cfb6ba5bc51f7ca7a544d5b025409c Mon Sep 17 00:00:00 2001 From: Henrik Kjellander Date: Fri, 30 Jun 2017 15:14:45 +0200 Subject: [PATCH] Revert "Update includes for webrtc/{base => rtc_base} rename (3/3)" This reverts commit https://codereview.webrtc.org/2963273002/ where the git cl format breaks include order on Windows. BUG=webrtc:7634 NOTRY=True TBR=kwiberg@webrtc.org Review-Url: https://codereview.webrtc.org/2962303003 . Cr-Commit-Position: refs/heads/master@{#18857} --- webrtc/rtc_base/array_view.h | 4 ++-- webrtc/rtc_base/array_view_unittest.cc | 8 +++---- webrtc/rtc_base/asyncinvoker-inl.h | 14 +++++------ webrtc/rtc_base/asyncinvoker.cc | 8 +++---- webrtc/rtc_base/asyncinvoker.h | 12 +++++----- webrtc/rtc_base/asyncpacketsocket.cc | 2 +- webrtc/rtc_base/asyncpacketsocket.h | 10 ++++---- webrtc/rtc_base/asyncresolverinterface.cc | 2 +- webrtc/rtc_base/asyncresolverinterface.h | 4 ++-- webrtc/rtc_base/asyncsocket.cc | 4 ++-- webrtc/rtc_base/asyncsocket.h | 4 ++-- webrtc/rtc_base/asynctcpsocket.cc | 8 +++---- webrtc/rtc_base/asynctcpsocket.h | 8 +++---- webrtc/rtc_base/asynctcpsocket_unittest.cc | 6 ++--- webrtc/rtc_base/asyncudpsocket.cc | 6 ++--- webrtc/rtc_base/asyncudpsocket.h | 4 ++-- webrtc/rtc_base/asyncudpsocket_unittest.cc | 8 +++---- webrtc/rtc_base/atomicops_unittest.cc | 2 +- webrtc/rtc_base/base64.cc | 4 ++-- webrtc/rtc_base/base64_unittest.cc | 10 ++++---- webrtc/rtc_base/basictypes_unittest.cc | 4 ++-- webrtc/rtc_base/bind.h | 4 ++-- webrtc/rtc_base/bind_unittest.cc | 6 ++--- webrtc/rtc_base/bitbuffer.cc | 4 ++-- webrtc/rtc_base/bitbuffer.h | 2 +- webrtc/rtc_base/bitbuffer_unittest.cc | 8 +++---- webrtc/rtc_base/buffer.h | 6 ++--- webrtc/rtc_base/buffer_unittest.cc | 6 ++--- webrtc/rtc_base/bufferqueue.cc | 2 +- webrtc/rtc_base/bufferqueue.h | 6 ++--- webrtc/rtc_base/bufferqueue_unittest.cc | 4 ++-- webrtc/rtc_base/bytebuffer.cc | 6 ++--- webrtc/rtc_base/bytebuffer.h | 6 ++--- webrtc/rtc_base/bytebuffer_unittest.cc | 8 +++---- webrtc/rtc_base/byteorder.h | 2 +- webrtc/rtc_base/byteorder_unittest.cc | 4 ++-- webrtc/rtc_base/callback.h | 4 ++-- webrtc/rtc_base/callback_unittest.cc | 10 ++++---- webrtc/rtc_base/checks.cc | 4 ++-- webrtc/rtc_base/checks.h | 2 +- webrtc/rtc_base/copyonwritebuffer.cc | 2 +- webrtc/rtc_base/copyonwritebuffer.h | 8 +++---- webrtc/rtc_base/copyonwritebuffer_unittest.cc | 4 ++-- webrtc/rtc_base/cpu_time.cc | 6 ++--- webrtc/rtc_base/cpu_time_unittest.cc | 10 ++++---- webrtc/rtc_base/crc32.cc | 4 ++-- webrtc/rtc_base/crc32.h | 2 +- webrtc/rtc_base/crc32_unittest.cc | 4 ++-- webrtc/rtc_base/criticalsection.cc | 6 ++--- webrtc/rtc_base/criticalsection.h | 10 ++++---- webrtc/rtc_base/criticalsection_unittest.cc | 14 +++++------ webrtc/rtc_base/cryptstring.cc | 2 +- webrtc/rtc_base/event.cc | 4 ++-- webrtc/rtc_base/event.h | 4 ++-- webrtc/rtc_base/event_tracer.cc | 22 ++++++++--------- webrtc/rtc_base/event_tracer_unittest.cc | 4 ++-- webrtc/rtc_base/event_unittest.cc | 4 ++-- webrtc/rtc_base/fakeclock.cc | 6 ++--- webrtc/rtc_base/fakeclock.h | 6 ++--- webrtc/rtc_base/fakenetwork.h | 10 ++++---- webrtc/rtc_base/fakesslidentity.h | 6 ++--- webrtc/rtc_base/file.cc | 2 +- webrtc/rtc_base/file.h | 6 ++--- webrtc/rtc_base/file_posix.cc | 4 ++-- webrtc/rtc_base/file_unittest.cc | 6 ++--- webrtc/rtc_base/file_win.cc | 6 ++--- webrtc/rtc_base/filerotatingstream.cc | 8 +++---- webrtc/rtc_base/filerotatingstream.h | 4 ++-- .../rtc_base/filerotatingstream_unittest.cc | 12 +++++----- webrtc/rtc_base/fileutils.cc | 14 +++++------ webrtc/rtc_base/fileutils.h | 6 ++--- webrtc/rtc_base/fileutils_unittest.cc | 8 +++---- webrtc/rtc_base/firewallsocketserver.cc | 8 +++---- webrtc/rtc_base/firewallsocketserver.h | 4 ++-- webrtc/rtc_base/flags.cc | 6 ++--- webrtc/rtc_base/flags.h | 4 ++-- webrtc/rtc_base/function_view.h | 2 +- webrtc/rtc_base/function_view_unittest.cc | 4 ++-- webrtc/rtc_base/gunit.h | 6 ++--- webrtc/rtc_base/helpers.cc | 12 +++++----- webrtc/rtc_base/helpers.h | 2 +- webrtc/rtc_base/helpers_unittest.cc | 8 +++---- webrtc/rtc_base/httpbase.cc | 14 +++++------ webrtc/rtc_base/httpbase.h | 2 +- webrtc/rtc_base/httpbase_unittest.cc | 6 ++--- webrtc/rtc_base/httpcommon-inl.h | 6 ++--- webrtc/rtc_base/httpcommon.cc | 20 ++++++++-------- webrtc/rtc_base/httpcommon.h | 8 +++---- webrtc/rtc_base/httpcommon_unittest.cc | 6 ++--- webrtc/rtc_base/httpserver.cc | 14 +++++------ webrtc/rtc_base/httpserver.h | 2 +- webrtc/rtc_base/httpserver_unittest.cc | 6 ++--- webrtc/rtc_base/ifaddrs-android.cc | 20 ++++++++-------- webrtc/rtc_base/ifaddrs_converter.cc | 2 +- webrtc/rtc_base/ifaddrs_converter.h | 4 ++-- webrtc/rtc_base/ipaddress.cc | 14 +++++------ webrtc/rtc_base/ipaddress.h | 6 ++--- webrtc/rtc_base/ipaddress_unittest.cc | 4 ++-- webrtc/rtc_base/json.cc | 2 +- webrtc/rtc_base/json_unittest.cc | 4 ++-- webrtc/rtc_base/keep_ref_until_done.h | 8 +++---- webrtc/rtc_base/location.cc | 4 ++-- webrtc/rtc_base/location.h | 2 +- webrtc/rtc_base/logging.cc | 12 +++++----- webrtc/rtc_base/logging.h | 6 ++--- webrtc/rtc_base/logging_unittest.cc | 12 +++++----- webrtc/rtc_base/logsinks.cc | 4 ++-- webrtc/rtc_base/logsinks.h | 6 ++--- webrtc/rtc_base/macifaddrs_converter.cc | 6 ++--- webrtc/rtc_base/macutils.cc | 8 +++---- webrtc/rtc_base/macutils_unittest.cc | 4 ++-- webrtc/rtc_base/mathutils.h | 2 +- webrtc/rtc_base/md5.cc | 4 ++-- webrtc/rtc_base/md5digest.cc | 2 +- webrtc/rtc_base/md5digest.h | 4 ++-- webrtc/rtc_base/md5digest_unittest.cc | 6 ++--- webrtc/rtc_base/memory_usage.cc | 4 ++-- webrtc/rtc_base/memory_usage_unittest.cc | 2 +- webrtc/rtc_base/messagedigest.cc | 8 +++---- webrtc/rtc_base/messagedigest_unittest.cc | 6 ++--- webrtc/rtc_base/messagehandler.cc | 4 ++-- webrtc/rtc_base/messagehandler.h | 2 +- webrtc/rtc_base/messagequeue.cc | 14 +++++------ webrtc/rtc_base/messagequeue.h | 20 ++++++++-------- webrtc/rtc_base/messagequeue_unittest.cc | 18 +++++++------- webrtc/rtc_base/mod_ops.h | 2 +- webrtc/rtc_base/mod_ops_unittest.cc | 2 +- webrtc/rtc_base/nat_unittest.cc | 22 ++++++++--------- webrtc/rtc_base/natserver.cc | 10 ++++---- webrtc/rtc_base/natserver.h | 14 +++++------ webrtc/rtc_base/natsocketfactory.cc | 12 +++++----- webrtc/rtc_base/natsocketfactory.h | 8 +++---- webrtc/rtc_base/nattypes.cc | 4 ++-- webrtc/rtc_base/nethelpers.cc | 20 ++++++++-------- webrtc/rtc_base/nethelpers.h | 12 +++++----- webrtc/rtc_base/network.cc | 20 ++++++++-------- webrtc/rtc_base/network.h | 8 +++---- webrtc/rtc_base/network_unittest.cc | 16 ++++++------- webrtc/rtc_base/networkmonitor.cc | 4 ++-- webrtc/rtc_base/networkmonitor.h | 6 ++--- webrtc/rtc_base/nullsocketserver.cc | 4 ++-- webrtc/rtc_base/nullsocketserver.h | 4 ++-- webrtc/rtc_base/nullsocketserver_unittest.cc | 4 ++-- webrtc/rtc_base/numerics/exp_filter.cc | 2 +- .../rtc_base/numerics/exp_filter_unittest.cc | 2 +- webrtc/rtc_base/numerics/percentile_filter.h | 2 +- .../numerics/percentile_filter_unittest.cc | 4 ++-- webrtc/rtc_base/onetimeevent.h | 2 +- webrtc/rtc_base/onetimeevent_unittest.cc | 4 ++-- webrtc/rtc_base/openssladapter.cc | 20 ++++++++-------- webrtc/rtc_base/openssladapter.h | 8 +++---- webrtc/rtc_base/openssldigest.cc | 6 ++--- webrtc/rtc_base/openssldigest.h | 2 +- webrtc/rtc_base/opensslidentity.cc | 14 +++++------ webrtc/rtc_base/opensslidentity.h | 6 ++--- webrtc/rtc_base/opensslstreamadapter.cc | 24 +++++++++---------- webrtc/rtc_base/opensslstreamadapter.h | 6 ++--- webrtc/rtc_base/optional.cc | 2 +- webrtc/rtc_base/optional.h | 6 ++--- webrtc/rtc_base/optional_unittest.cc | 4 ++-- webrtc/rtc_base/optionsfile.cc | 8 +++---- webrtc/rtc_base/optionsfile_unittest.cc | 10 ++++---- webrtc/rtc_base/pathutils.cc | 10 ++++---- webrtc/rtc_base/pathutils.h | 2 +- webrtc/rtc_base/pathutils_unittest.cc | 4 ++-- webrtc/rtc_base/physicalsocketserver.cc | 20 ++++++++-------- webrtc/rtc_base/physicalsocketserver.h | 6 ++--- .../rtc_base/physicalsocketserver_unittest.cc | 14 +++++------ webrtc/rtc_base/platform_file.cc | 2 +- webrtc/rtc_base/platform_file.h | 2 +- webrtc/rtc_base/platform_thread.cc | 10 ++++---- webrtc/rtc_base/platform_thread.h | 8 +++---- webrtc/rtc_base/platform_thread_unittest.cc | 2 +- webrtc/rtc_base/proxy_unittest.cc | 14 +++++------ webrtc/rtc_base/proxyinfo.cc | 2 +- webrtc/rtc_base/proxyinfo.h | 4 ++-- webrtc/rtc_base/proxyserver.cc | 6 ++--- webrtc/rtc_base/proxyserver.h | 10 ++++---- webrtc/rtc_base/ptr_util_unittest.cc | 4 ++-- webrtc/rtc_base/race_checker.cc | 2 +- webrtc/rtc_base/race_checker.h | 6 ++--- webrtc/rtc_base/random.cc | 4 ++-- webrtc/rtc_base/random.h | 6 ++--- webrtc/rtc_base/random_unittest.cc | 4 ++-- webrtc/rtc_base/rate_limiter.cc | 2 +- webrtc/rtc_base/rate_limiter.h | 6 ++--- webrtc/rtc_base/rate_limiter_unittest.cc | 8 +++---- webrtc/rtc_base/rate_statistics.cc | 4 ++-- webrtc/rtc_base/rate_statistics.h | 2 +- webrtc/rtc_base/rate_statistics_unittest.cc | 2 +- webrtc/rtc_base/ratelimiter.cc | 2 +- webrtc/rtc_base/ratelimiter_unittest.cc | 4 ++-- webrtc/rtc_base/ratetracker.cc | 6 ++--- webrtc/rtc_base/ratetracker.h | 2 +- webrtc/rtc_base/ratetracker_unittest.cc | 4 ++-- webrtc/rtc_base/refcount.h | 2 +- webrtc/rtc_base/refcountedobject.h | 2 +- webrtc/rtc_base/refcountedobject_unittest.cc | 4 ++-- webrtc/rtc_base/rollingaccumulator.h | 4 ++-- .../rtc_base/rollingaccumulator_unittest.cc | 4 ++-- webrtc/rtc_base/rtccertificate.cc | 4 ++-- webrtc/rtc_base/rtccertificate.h | 6 ++--- webrtc/rtc_base/rtccertificate_unittest.cc | 18 +++++++------- webrtc/rtc_base/rtccertificategenerator.cc | 6 ++--- webrtc/rtc_base/rtccertificategenerator.h | 12 +++++----- .../rtccertificategenerator_unittest.cc | 12 +++++----- webrtc/rtc_base/safe_compare.h | 2 +- webrtc/rtc_base/safe_compare_unittest.cc | 2 +- webrtc/rtc_base/safe_conversions.h | 4 ++-- webrtc/rtc_base/safe_minmax.h | 6 ++--- webrtc/rtc_base/safe_minmax_unittest.cc | 2 +- webrtc/rtc_base/sequenced_task_checker.h | 8 +++---- .../rtc_base/sequenced_task_checker_impl.cc | 8 +++---- webrtc/rtc_base/sequenced_task_checker_impl.h | 2 +- .../sequenced_task_checker_unittest.cc | 10 ++++---- webrtc/rtc_base/sha1.cc | 2 +- webrtc/rtc_base/sha1digest.cc | 2 +- webrtc/rtc_base/sha1digest.h | 4 ++-- webrtc/rtc_base/sha1digest_unittest.cc | 6 ++--- webrtc/rtc_base/sigslot.cc | 2 +- webrtc/rtc_base/sigslot.h | 2 +- webrtc/rtc_base/sigslot_unittest.cc | 4 ++-- webrtc/rtc_base/sigslottester.h | 4 ++-- webrtc/rtc_base/sigslottester_unittest.cc | 6 ++--- webrtc/rtc_base/socket.h | 8 +++---- webrtc/rtc_base/socket_unittest.cc | 22 ++++++++--------- webrtc/rtc_base/socket_unittest.h | 4 ++-- webrtc/rtc_base/socketadapters.cc | 14 +++++------ webrtc/rtc_base/socketadapters.h | 8 +++---- webrtc/rtc_base/socketaddress.cc | 12 +++++----- webrtc/rtc_base/socketaddress.h | 6 ++--- webrtc/rtc_base/socketaddress_unittest.cc | 6 ++--- webrtc/rtc_base/socketaddresspair.cc | 2 +- webrtc/rtc_base/socketaddresspair.h | 2 +- webrtc/rtc_base/socketfactory.h | 4 ++-- webrtc/rtc_base/socketserver.h | 2 +- webrtc/rtc_base/socketstream.cc | 4 ++-- webrtc/rtc_base/socketstream.h | 6 ++--- webrtc/rtc_base/ssladapter.cc | 4 ++-- webrtc/rtc_base/ssladapter.h | 4 ++-- webrtc/rtc_base/ssladapter_unittest.cc | 18 +++++++------- webrtc/rtc_base/sslfingerprint.cc | 10 ++++---- webrtc/rtc_base/sslfingerprint.h | 8 +++---- webrtc/rtc_base/sslidentity.cc | 12 +++++----- webrtc/rtc_base/sslidentity.h | 8 +++---- webrtc/rtc_base/sslidentity_unittest.cc | 14 +++++------ webrtc/rtc_base/sslstreamadapter.cc | 4 ++-- webrtc/rtc_base/sslstreamadapter.h | 4 ++-- webrtc/rtc_base/sslstreamadapter_unittest.cc | 16 ++++++------- webrtc/rtc_base/stream.cc | 20 ++++++++-------- webrtc/rtc_base/stream.h | 14 +++++------ webrtc/rtc_base/stream_unittest.cc | 8 +++---- webrtc/rtc_base/string_to_number.cc | 2 +- webrtc/rtc_base/string_to_number.h | 2 +- webrtc/rtc_base/string_to_number_unittest.cc | 4 ++-- webrtc/rtc_base/stringencode.cc | 6 ++--- webrtc/rtc_base/stringencode.h | 2 +- webrtc/rtc_base/stringencode_unittest.cc | 8 +++---- webrtc/rtc_base/stringize_macros_unittest.cc | 2 +- webrtc/rtc_base/stringutils.cc | 4 ++-- webrtc/rtc_base/stringutils_unittest.cc | 4 ++-- webrtc/rtc_base/swap_queue.h | 6 ++--- webrtc/rtc_base/swap_queue_unittest.cc | 2 +- webrtc/rtc_base/task_queue.h | 10 ++++---- webrtc/rtc_base/task_queue_gcd.cc | 8 +++---- webrtc/rtc_base/task_queue_libevent.cc | 10 ++++---- webrtc/rtc_base/task_queue_posix.cc | 6 ++--- webrtc/rtc_base/task_queue_unittest.cc | 10 ++++---- webrtc/rtc_base/task_queue_win.cc | 12 +++++----- webrtc/rtc_base/testclient.cc | 10 ++++---- webrtc/rtc_base/testclient.h | 8 +++---- webrtc/rtc_base/testclient_unittest.cc | 14 +++++------ webrtc/rtc_base/testechoserver.h | 10 ++++---- webrtc/rtc_base/testutils.h | 20 ++++++++-------- webrtc/rtc_base/thread.cc | 18 +++++++------- webrtc/rtc_base/thread.h | 10 ++++---- .../rtc_base/thread_annotations_unittest.cc | 2 +- webrtc/rtc_base/thread_checker.h | 8 +++---- webrtc/rtc_base/thread_checker_impl.cc | 4 ++-- webrtc/rtc_base/thread_checker_impl.h | 4 ++-- webrtc/rtc_base/thread_checker_unittest.cc | 10 ++++---- webrtc/rtc_base/thread_unittest.cc | 16 ++++++------- webrtc/rtc_base/timedelta.h | 2 +- webrtc/rtc_base/timestampaligner.cc | 8 +++---- webrtc/rtc_base/timestampaligner.h | 2 +- webrtc/rtc_base/timestampaligner_unittest.cc | 6 ++--- webrtc/rtc_base/timeutils.cc | 4 ++-- webrtc/rtc_base/timeutils_unittest.cc | 12 +++++----- webrtc/rtc_base/trace_event.h | 2 +- webrtc/rtc_base/transformadapter.cc | 4 ++-- webrtc/rtc_base/transformadapter.h | 2 +- webrtc/rtc_base/unittest_main.cc | 12 +++++----- webrtc/rtc_base/unixfilesystem.cc | 16 ++++++------- webrtc/rtc_base/unixfilesystem.h | 2 +- webrtc/rtc_base/virtualsocket_unittest.cc | 20 ++++++++-------- webrtc/rtc_base/virtualsocketserver.cc | 16 ++++++------- webrtc/rtc_base/virtualsocketserver.h | 12 +++++----- webrtc/rtc_base/weak_ptr.cc | 2 +- webrtc/rtc_base/weak_ptr.h | 6 ++--- webrtc/rtc_base/weak_ptr_unittest.cc | 6 ++--- webrtc/rtc_base/win32.cc | 12 +++++----- webrtc/rtc_base/win32.h | 4 ++-- webrtc/rtc_base/win32_unittest.cc | 6 ++--- webrtc/rtc_base/win32filesystem.cc | 16 ++++++------- webrtc/rtc_base/win32securityerrors.cc | 4 ++-- webrtc/rtc_base/win32socketinit.cc | 4 ++-- webrtc/rtc_base/win32socketserver.cc | 10 ++++---- webrtc/rtc_base/win32socketserver.h | 16 ++++++------- webrtc/rtc_base/win32socketserver_unittest.cc | 8 +++---- webrtc/rtc_base/win32window.cc | 6 ++--- webrtc/rtc_base/win32window.h | 2 +- webrtc/rtc_base/win32window_unittest.cc | 6 ++--- webrtc/rtc_base/window.h | 6 ++--- 313 files changed, 1076 insertions(+), 1076 deletions(-) diff --git a/webrtc/rtc_base/array_view.h b/webrtc/rtc_base/array_view.h index afc69995ae..0f0e3f3790 100644 --- a/webrtc/rtc_base/array_view.h +++ b/webrtc/rtc_base/array_view.h @@ -11,8 +11,8 @@ #ifndef WEBRTC_RTC_BASE_ARRAY_VIEW_H_ #define WEBRTC_RTC_BASE_ARRAY_VIEW_H_ -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/type_traits.h" +#include "webrtc/base/checks.h" +#include "webrtc/base/type_traits.h" namespace rtc { diff --git a/webrtc/rtc_base/array_view_unittest.cc b/webrtc/rtc_base/array_view_unittest.cc index 6c30beffd1..035f25ca49 100644 --- a/webrtc/rtc_base/array_view_unittest.cc +++ b/webrtc/rtc_base/array_view_unittest.cc @@ -12,10 +12,10 @@ #include #include -#include "webrtc/rtc_base/array_view.h" -#include "webrtc/rtc_base/buffer.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/gunit.h" +#include "webrtc/base/array_view.h" +#include "webrtc/base/buffer.h" +#include "webrtc/base/checks.h" +#include "webrtc/base/gunit.h" #include "webrtc/test/gmock.h" namespace rtc { diff --git a/webrtc/rtc_base/asyncinvoker-inl.h b/webrtc/rtc_base/asyncinvoker-inl.h index 5b2cf4e250..427d76df38 100644 --- a/webrtc/rtc_base/asyncinvoker-inl.h +++ b/webrtc/rtc_base/asyncinvoker-inl.h @@ -11,13 +11,13 @@ #ifndef WEBRTC_RTC_BASE_ASYNCINVOKER_INL_H_ #define WEBRTC_RTC_BASE_ASYNCINVOKER_INL_H_ -#include "webrtc/rtc_base/atomicops.h" -#include "webrtc/rtc_base/bind.h" -#include "webrtc/rtc_base/criticalsection.h" -#include "webrtc/rtc_base/messagehandler.h" -#include "webrtc/rtc_base/sigslot.h" -#include "webrtc/rtc_base/thread.h" -#include "webrtc/rtc_base/thread_annotations.h" +#include "webrtc/base/atomicops.h" +#include "webrtc/base/bind.h" +#include "webrtc/base/criticalsection.h" +#include "webrtc/base/messagehandler.h" +#include "webrtc/base/sigslot.h" +#include "webrtc/base/thread.h" +#include "webrtc/base/thread_annotations.h" namespace rtc { diff --git a/webrtc/rtc_base/asyncinvoker.cc b/webrtc/rtc_base/asyncinvoker.cc index 94abfd5d08..bfd13172f7 100644 --- a/webrtc/rtc_base/asyncinvoker.cc +++ b/webrtc/rtc_base/asyncinvoker.cc @@ -8,11 +8,11 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/rtc_base/asyncinvoker.h" +#include "webrtc/base/asyncinvoker.h" -#include "webrtc/rtc_base/atomicops.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/logging.h" +#include "webrtc/base/atomicops.h" +#include "webrtc/base/checks.h" +#include "webrtc/base/logging.h" namespace rtc { diff --git a/webrtc/rtc_base/asyncinvoker.h b/webrtc/rtc_base/asyncinvoker.h index 17d702a37b..03e5724f09 100644 --- a/webrtc/rtc_base/asyncinvoker.h +++ b/webrtc/rtc_base/asyncinvoker.h @@ -14,12 +14,12 @@ #include #include -#include "webrtc/rtc_base/asyncinvoker-inl.h" -#include "webrtc/rtc_base/bind.h" -#include "webrtc/rtc_base/constructormagic.h" -#include "webrtc/rtc_base/event.h" -#include "webrtc/rtc_base/sigslot.h" -#include "webrtc/rtc_base/thread.h" +#include "webrtc/base/asyncinvoker-inl.h" +#include "webrtc/base/bind.h" +#include "webrtc/base/constructormagic.h" +#include "webrtc/base/event.h" +#include "webrtc/base/sigslot.h" +#include "webrtc/base/thread.h" namespace rtc { diff --git a/webrtc/rtc_base/asyncpacketsocket.cc b/webrtc/rtc_base/asyncpacketsocket.cc index 5c9bcbb4a4..fe36401f17 100644 --- a/webrtc/rtc_base/asyncpacketsocket.cc +++ b/webrtc/rtc_base/asyncpacketsocket.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/rtc_base/asyncpacketsocket.h" +#include "webrtc/base/asyncpacketsocket.h" namespace rtc { diff --git a/webrtc/rtc_base/asyncpacketsocket.h b/webrtc/rtc_base/asyncpacketsocket.h index 596812d26a..5a6c97ec78 100644 --- a/webrtc/rtc_base/asyncpacketsocket.h +++ b/webrtc/rtc_base/asyncpacketsocket.h @@ -11,11 +11,11 @@ #ifndef WEBRTC_RTC_BASE_ASYNCPACKETSOCKET_H_ #define WEBRTC_RTC_BASE_ASYNCPACKETSOCKET_H_ -#include "webrtc/rtc_base/constructormagic.h" -#include "webrtc/rtc_base/dscp.h" -#include "webrtc/rtc_base/sigslot.h" -#include "webrtc/rtc_base/socket.h" -#include "webrtc/rtc_base/timeutils.h" +#include "webrtc/base/constructormagic.h" +#include "webrtc/base/dscp.h" +#include "webrtc/base/sigslot.h" +#include "webrtc/base/socket.h" +#include "webrtc/base/timeutils.h" namespace rtc { diff --git a/webrtc/rtc_base/asyncresolverinterface.cc b/webrtc/rtc_base/asyncresolverinterface.cc index b6f2c48f11..7ee02f153e 100644 --- a/webrtc/rtc_base/asyncresolverinterface.cc +++ b/webrtc/rtc_base/asyncresolverinterface.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/rtc_base/asyncresolverinterface.h" +#include "webrtc/base/asyncresolverinterface.h" namespace rtc { diff --git a/webrtc/rtc_base/asyncresolverinterface.h b/webrtc/rtc_base/asyncresolverinterface.h index 7b8c533b40..1784019c92 100644 --- a/webrtc/rtc_base/asyncresolverinterface.h +++ b/webrtc/rtc_base/asyncresolverinterface.h @@ -11,8 +11,8 @@ #ifndef WEBRTC_RTC_BASE_ASYNCRESOLVERINTERFACE_H_ #define WEBRTC_RTC_BASE_ASYNCRESOLVERINTERFACE_H_ -#include "webrtc/rtc_base/sigslot.h" -#include "webrtc/rtc_base/socketaddress.h" +#include "webrtc/base/sigslot.h" +#include "webrtc/base/socketaddress.h" namespace rtc { diff --git a/webrtc/rtc_base/asyncsocket.cc b/webrtc/rtc_base/asyncsocket.cc index 7cb76ccb44..c593c4fb2c 100644 --- a/webrtc/rtc_base/asyncsocket.cc +++ b/webrtc/rtc_base/asyncsocket.cc @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/rtc_base/asyncsocket.h" -#include "webrtc/rtc_base/checks.h" +#include "webrtc/base/asyncsocket.h" +#include "webrtc/base/checks.h" namespace rtc { diff --git a/webrtc/rtc_base/asyncsocket.h b/webrtc/rtc_base/asyncsocket.h index 7284506dd3..3aa5d76a89 100644 --- a/webrtc/rtc_base/asyncsocket.h +++ b/webrtc/rtc_base/asyncsocket.h @@ -11,8 +11,8 @@ #ifndef WEBRTC_RTC_BASE_ASYNCSOCKET_H_ #define WEBRTC_RTC_BASE_ASYNCSOCKET_H_ -#include "webrtc/rtc_base/sigslot.h" -#include "webrtc/rtc_base/socket.h" +#include "webrtc/base/sigslot.h" +#include "webrtc/base/socket.h" namespace rtc { diff --git a/webrtc/rtc_base/asynctcpsocket.cc b/webrtc/rtc_base/asynctcpsocket.cc index 1da70dff43..658541cdde 100644 --- a/webrtc/rtc_base/asynctcpsocket.cc +++ b/webrtc/rtc_base/asynctcpsocket.cc @@ -8,16 +8,16 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/rtc_base/asynctcpsocket.h" +#include "webrtc/base/asynctcpsocket.h" #include #include #include -#include "webrtc/rtc_base/byteorder.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/logging.h" +#include "webrtc/base/byteorder.h" +#include "webrtc/base/checks.h" +#include "webrtc/base/logging.h" #if defined(WEBRTC_POSIX) #include diff --git a/webrtc/rtc_base/asynctcpsocket.h b/webrtc/rtc_base/asynctcpsocket.h index 1fee4fe236..cf764560fc 100644 --- a/webrtc/rtc_base/asynctcpsocket.h +++ b/webrtc/rtc_base/asynctcpsocket.h @@ -13,10 +13,10 @@ #include -#include "webrtc/rtc_base/asyncpacketsocket.h" -#include "webrtc/rtc_base/buffer.h" -#include "webrtc/rtc_base/constructormagic.h" -#include "webrtc/rtc_base/socketfactory.h" +#include "webrtc/base/asyncpacketsocket.h" +#include "webrtc/base/buffer.h" +#include "webrtc/base/constructormagic.h" +#include "webrtc/base/socketfactory.h" namespace rtc { diff --git a/webrtc/rtc_base/asynctcpsocket_unittest.cc b/webrtc/rtc_base/asynctcpsocket_unittest.cc index f120db02a2..bd7dcfbdbf 100644 --- a/webrtc/rtc_base/asynctcpsocket_unittest.cc +++ b/webrtc/rtc_base/asynctcpsocket_unittest.cc @@ -11,9 +11,9 @@ #include #include -#include "webrtc/rtc_base/asynctcpsocket.h" -#include "webrtc/rtc_base/gunit.h" -#include "webrtc/rtc_base/virtualsocketserver.h" +#include "webrtc/base/asynctcpsocket.h" +#include "webrtc/base/gunit.h" +#include "webrtc/base/virtualsocketserver.h" namespace rtc { diff --git a/webrtc/rtc_base/asyncudpsocket.cc b/webrtc/rtc_base/asyncudpsocket.cc index c5068a6ded..0bccb73836 100644 --- a/webrtc/rtc_base/asyncudpsocket.cc +++ b/webrtc/rtc_base/asyncudpsocket.cc @@ -8,9 +8,9 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/rtc_base/asyncudpsocket.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/logging.h" +#include "webrtc/base/asyncudpsocket.h" +#include "webrtc/base/checks.h" +#include "webrtc/base/logging.h" namespace rtc { diff --git a/webrtc/rtc_base/asyncudpsocket.h b/webrtc/rtc_base/asyncudpsocket.h index 15c1e767e3..bff70f14e6 100644 --- a/webrtc/rtc_base/asyncudpsocket.h +++ b/webrtc/rtc_base/asyncudpsocket.h @@ -13,8 +13,8 @@ #include -#include "webrtc/rtc_base/asyncpacketsocket.h" -#include "webrtc/rtc_base/socketfactory.h" +#include "webrtc/base/asyncpacketsocket.h" +#include "webrtc/base/socketfactory.h" namespace rtc { diff --git a/webrtc/rtc_base/asyncudpsocket_unittest.cc b/webrtc/rtc_base/asyncudpsocket_unittest.cc index c16c59dddb..99220056b4 100644 --- a/webrtc/rtc_base/asyncudpsocket_unittest.cc +++ b/webrtc/rtc_base/asyncudpsocket_unittest.cc @@ -11,10 +11,10 @@ #include #include -#include "webrtc/rtc_base/asyncudpsocket.h" -#include "webrtc/rtc_base/gunit.h" -#include "webrtc/rtc_base/physicalsocketserver.h" -#include "webrtc/rtc_base/virtualsocketserver.h" +#include "webrtc/base/asyncudpsocket.h" +#include "webrtc/base/gunit.h" +#include "webrtc/base/physicalsocketserver.h" +#include "webrtc/base/virtualsocketserver.h" namespace rtc { diff --git a/webrtc/rtc_base/atomicops_unittest.cc b/webrtc/rtc_base/atomicops_unittest.cc index d5a1105f81..2aa28cac61 100644 --- a/webrtc/rtc_base/atomicops_unittest.cc +++ b/webrtc/rtc_base/atomicops_unittest.cc @@ -9,4 +9,4 @@ */ // TODO(pbos): Move AtomicOps tests to here from -// webrtc/rtc_base/criticalsection_unittest.cc. +// webrtc/base/criticalsection_unittest.cc. diff --git a/webrtc/rtc_base/base64.cc b/webrtc/rtc_base/base64.cc index 5fe424dd2f..43b63257a6 100644 --- a/webrtc/rtc_base/base64.cc +++ b/webrtc/rtc_base/base64.cc @@ -14,11 +14,11 @@ //* //********************************************************************* -#include "webrtc/rtc_base/base64.h" +#include "webrtc/base/base64.h" #include -#include "webrtc/rtc_base/checks.h" +#include "webrtc/base/checks.h" using std::vector; diff --git a/webrtc/rtc_base/base64_unittest.cc b/webrtc/rtc_base/base64_unittest.cc index c418c6f069..6bfba7949a 100644 --- a/webrtc/rtc_base/base64_unittest.cc +++ b/webrtc/rtc_base/base64_unittest.cc @@ -8,12 +8,12 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/rtc_base/base64.h" -#include "webrtc/rtc_base/gunit.h" -#include "webrtc/rtc_base/logging.h" -#include "webrtc/rtc_base/stringutils.h" +#include "webrtc/base/base64.h" +#include "webrtc/base/gunit.h" +#include "webrtc/base/logging.h" +#include "webrtc/base/stringutils.h" -#include "webrtc/rtc_base/testbase64.h" +#include "webrtc/base/testbase64.h" using namespace std; using namespace rtc; diff --git a/webrtc/rtc_base/basictypes_unittest.cc b/webrtc/rtc_base/basictypes_unittest.cc index 550e61d4b0..df5ed5e7e5 100644 --- a/webrtc/rtc_base/basictypes_unittest.cc +++ b/webrtc/rtc_base/basictypes_unittest.cc @@ -8,9 +8,9 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/rtc_base/basictypes.h" +#include "webrtc/base/basictypes.h" -#include "webrtc/rtc_base/gunit.h" +#include "webrtc/base/gunit.h" namespace rtc { diff --git a/webrtc/rtc_base/bind.h b/webrtc/rtc_base/bind.h index 0918fbc56a..975a5e0aa2 100644 --- a/webrtc/rtc_base/bind.h +++ b/webrtc/rtc_base/bind.h @@ -64,8 +64,8 @@ #include #include -#include "webrtc/rtc_base/scoped_ref_ptr.h" -#include "webrtc/rtc_base/template_util.h" +#include "webrtc/base/scoped_ref_ptr.h" +#include "webrtc/base/template_util.h" #define NONAME diff --git a/webrtc/rtc_base/bind_unittest.cc b/webrtc/rtc_base/bind_unittest.cc index 64d6ee43dd..c97a555d87 100644 --- a/webrtc/rtc_base/bind_unittest.cc +++ b/webrtc/rtc_base/bind_unittest.cc @@ -10,10 +10,10 @@ #include -#include "webrtc/rtc_base/bind.h" -#include "webrtc/rtc_base/gunit.h" +#include "webrtc/base/bind.h" +#include "webrtc/base/gunit.h" -#include "webrtc/rtc_base/refcount.h" +#include "webrtc/base/refcount.h" namespace rtc { diff --git a/webrtc/rtc_base/bitbuffer.cc b/webrtc/rtc_base/bitbuffer.cc index fec64e6ef7..4ea2b155a1 100644 --- a/webrtc/rtc_base/bitbuffer.cc +++ b/webrtc/rtc_base/bitbuffer.cc @@ -8,12 +8,12 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/rtc_base/bitbuffer.h" +#include "webrtc/base/bitbuffer.h" #include #include -#include "webrtc/rtc_base/checks.h" +#include "webrtc/base/checks.h" namespace { diff --git a/webrtc/rtc_base/bitbuffer.h b/webrtc/rtc_base/bitbuffer.h index 03e8ff943c..bd5e5f84cc 100644 --- a/webrtc/rtc_base/bitbuffer.h +++ b/webrtc/rtc_base/bitbuffer.h @@ -14,7 +14,7 @@ #include // For integer types. #include // For size_t. -#include "webrtc/rtc_base/constructormagic.h" +#include "webrtc/base/constructormagic.h" namespace rtc { diff --git a/webrtc/rtc_base/bitbuffer_unittest.cc b/webrtc/rtc_base/bitbuffer_unittest.cc index b9d61558c2..16142995f2 100644 --- a/webrtc/rtc_base/bitbuffer_unittest.cc +++ b/webrtc/rtc_base/bitbuffer_unittest.cc @@ -8,10 +8,10 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/rtc_base/bitbuffer.h" -#include "webrtc/rtc_base/arraysize.h" -#include "webrtc/rtc_base/bytebuffer.h" -#include "webrtc/rtc_base/gunit.h" +#include "webrtc/base/arraysize.h" +#include "webrtc/base/bitbuffer.h" +#include "webrtc/base/bytebuffer.h" +#include "webrtc/base/gunit.h" namespace rtc { diff --git a/webrtc/rtc_base/buffer.h b/webrtc/rtc_base/buffer.h index 25d55e06a3..171d1ea242 100644 --- a/webrtc/rtc_base/buffer.h +++ b/webrtc/rtc_base/buffer.h @@ -17,9 +17,9 @@ #include #include -#include "webrtc/rtc_base/array_view.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/type_traits.h" +#include "webrtc/base/array_view.h" +#include "webrtc/base/checks.h" +#include "webrtc/base/type_traits.h" namespace rtc { diff --git a/webrtc/rtc_base/buffer_unittest.cc b/webrtc/rtc_base/buffer_unittest.cc index bd4306e80f..82baedb565 100644 --- a/webrtc/rtc_base/buffer_unittest.cc +++ b/webrtc/rtc_base/buffer_unittest.cc @@ -8,10 +8,10 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/rtc_base/buffer.h" +#include "webrtc/base/buffer.h" -#include "webrtc/rtc_base/array_view.h" -#include "webrtc/rtc_base/gunit.h" +#include "webrtc/base/array_view.h" +#include "webrtc/base/gunit.h" #include #include diff --git a/webrtc/rtc_base/bufferqueue.cc b/webrtc/rtc_base/bufferqueue.cc index 9072043bf0..6e5439da26 100644 --- a/webrtc/rtc_base/bufferqueue.cc +++ b/webrtc/rtc_base/bufferqueue.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/rtc_base/bufferqueue.h" +#include "webrtc/base/bufferqueue.h" #include diff --git a/webrtc/rtc_base/bufferqueue.h b/webrtc/rtc_base/bufferqueue.h index 3abb8cfa6a..7db2c8cb5b 100644 --- a/webrtc/rtc_base/bufferqueue.h +++ b/webrtc/rtc_base/bufferqueue.h @@ -14,9 +14,9 @@ #include #include -#include "webrtc/rtc_base/buffer.h" -#include "webrtc/rtc_base/constructormagic.h" -#include "webrtc/rtc_base/criticalsection.h" +#include "webrtc/base/buffer.h" +#include "webrtc/base/constructormagic.h" +#include "webrtc/base/criticalsection.h" namespace rtc { diff --git a/webrtc/rtc_base/bufferqueue_unittest.cc b/webrtc/rtc_base/bufferqueue_unittest.cc index 23d1751369..07084c4a61 100644 --- a/webrtc/rtc_base/bufferqueue_unittest.cc +++ b/webrtc/rtc_base/bufferqueue_unittest.cc @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/rtc_base/bufferqueue.h" -#include "webrtc/rtc_base/gunit.h" +#include "webrtc/base/bufferqueue.h" +#include "webrtc/base/gunit.h" namespace rtc { diff --git a/webrtc/rtc_base/bytebuffer.cc b/webrtc/rtc_base/bytebuffer.cc index 6bee27fa29..859c123f02 100644 --- a/webrtc/rtc_base/bytebuffer.cc +++ b/webrtc/rtc_base/bytebuffer.cc @@ -8,14 +8,14 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/rtc_base/bytebuffer.h" +#include "webrtc/base/bytebuffer.h" #include #include -#include "webrtc/rtc_base/basictypes.h" -#include "webrtc/rtc_base/byteorder.h" +#include "webrtc/base/basictypes.h" +#include "webrtc/base/byteorder.h" namespace rtc { diff --git a/webrtc/rtc_base/bytebuffer.h b/webrtc/rtc_base/bytebuffer.h index 36b18d22cd..b631ae1d4e 100644 --- a/webrtc/rtc_base/bytebuffer.h +++ b/webrtc/rtc_base/bytebuffer.h @@ -13,9 +13,9 @@ #include -#include "webrtc/rtc_base/basictypes.h" -#include "webrtc/rtc_base/buffer.h" -#include "webrtc/rtc_base/constructormagic.h" +#include "webrtc/base/basictypes.h" +#include "webrtc/base/buffer.h" +#include "webrtc/base/constructormagic.h" namespace rtc { diff --git a/webrtc/rtc_base/bytebuffer_unittest.cc b/webrtc/rtc_base/bytebuffer_unittest.cc index afca3533f8..597f5f5a18 100644 --- a/webrtc/rtc_base/bytebuffer_unittest.cc +++ b/webrtc/rtc_base/bytebuffer_unittest.cc @@ -8,10 +8,10 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/rtc_base/bytebuffer.h" -#include "webrtc/rtc_base/arraysize.h" -#include "webrtc/rtc_base/byteorder.h" -#include "webrtc/rtc_base/gunit.h" +#include "webrtc/base/arraysize.h" +#include "webrtc/base/bytebuffer.h" +#include "webrtc/base/byteorder.h" +#include "webrtc/base/gunit.h" namespace rtc { diff --git a/webrtc/rtc_base/byteorder.h b/webrtc/rtc_base/byteorder.h index 760ea06e16..d188f3126a 100644 --- a/webrtc/rtc_base/byteorder.h +++ b/webrtc/rtc_base/byteorder.h @@ -15,7 +15,7 @@ #include #endif -#include "webrtc/rtc_base/basictypes.h" +#include "webrtc/base/basictypes.h" #if defined(WEBRTC_MAC) #include diff --git a/webrtc/rtc_base/byteorder_unittest.cc b/webrtc/rtc_base/byteorder_unittest.cc index aba8e9fff7..6d9b44f9bb 100644 --- a/webrtc/rtc_base/byteorder_unittest.cc +++ b/webrtc/rtc_base/byteorder_unittest.cc @@ -10,8 +10,8 @@ #include -#include "webrtc/rtc_base/byteorder.h" -#include "webrtc/rtc_base/gunit.h" +#include "webrtc/base/byteorder.h" +#include "webrtc/base/gunit.h" namespace rtc { diff --git a/webrtc/rtc_base/callback.h b/webrtc/rtc_base/callback.h index 41077e8509..4435a18d18 100644 --- a/webrtc/rtc_base/callback.h +++ b/webrtc/rtc_base/callback.h @@ -62,8 +62,8 @@ #ifndef WEBRTC_RTC_BASE_CALLBACK_H_ #define WEBRTC_RTC_BASE_CALLBACK_H_ -#include "webrtc/rtc_base/refcount.h" -#include "webrtc/rtc_base/scoped_ref_ptr.h" +#include "webrtc/base/refcount.h" +#include "webrtc/base/scoped_ref_ptr.h" namespace rtc { diff --git a/webrtc/rtc_base/callback_unittest.cc b/webrtc/rtc_base/callback_unittest.cc index 0628686cde..aba1e0ce28 100644 --- a/webrtc/rtc_base/callback_unittest.cc +++ b/webrtc/rtc_base/callback_unittest.cc @@ -8,11 +8,11 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/rtc_base/callback.h" -#include "webrtc/rtc_base/bind.h" -#include "webrtc/rtc_base/gunit.h" -#include "webrtc/rtc_base/keep_ref_until_done.h" -#include "webrtc/rtc_base/refcount.h" +#include "webrtc/base/bind.h" +#include "webrtc/base/callback.h" +#include "webrtc/base/gunit.h" +#include "webrtc/base/keep_ref_until_done.h" +#include "webrtc/base/refcount.h" namespace rtc { diff --git a/webrtc/rtc_base/checks.cc b/webrtc/rtc_base/checks.cc index 533240f066..32c2f58373 100644 --- a/webrtc/rtc_base/checks.cc +++ b/webrtc/rtc_base/checks.cc @@ -30,8 +30,8 @@ #include #endif -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/logging.h" +#include "webrtc/base/checks.h" +#include "webrtc/base/logging.h" #if defined(_MSC_VER) // Warning C4722: destructor never returns, potential memory leak. diff --git a/webrtc/rtc_base/checks.h b/webrtc/rtc_base/checks.h index f9507e239c..d2fb115e88 100644 --- a/webrtc/rtc_base/checks.h +++ b/webrtc/rtc_base/checks.h @@ -36,7 +36,7 @@ NO_RETURN void rtc_FatalMessage(const char* file, int line, const char* msg); #include #include -#include "webrtc/rtc_base/safe_compare.h" +#include "webrtc/base/safe_compare.h" // The macros here print a message to stderr and abort under various // conditions. All will accept additional stream messages. For example: diff --git a/webrtc/rtc_base/copyonwritebuffer.cc b/webrtc/rtc_base/copyonwritebuffer.cc index 76db6f5c76..e1ba8de881 100644 --- a/webrtc/rtc_base/copyonwritebuffer.cc +++ b/webrtc/rtc_base/copyonwritebuffer.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/rtc_base/copyonwritebuffer.h" +#include "webrtc/base/copyonwritebuffer.h" namespace rtc { diff --git a/webrtc/rtc_base/copyonwritebuffer.h b/webrtc/rtc_base/copyonwritebuffer.h index a247917c96..d0cdafb34c 100644 --- a/webrtc/rtc_base/copyonwritebuffer.h +++ b/webrtc/rtc_base/copyonwritebuffer.h @@ -14,10 +14,10 @@ #include #include -#include "webrtc/rtc_base/buffer.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/refcount.h" -#include "webrtc/rtc_base/scoped_ref_ptr.h" +#include "webrtc/base/buffer.h" +#include "webrtc/base/checks.h" +#include "webrtc/base/refcount.h" +#include "webrtc/base/scoped_ref_ptr.h" namespace rtc { diff --git a/webrtc/rtc_base/copyonwritebuffer_unittest.cc b/webrtc/rtc_base/copyonwritebuffer_unittest.cc index 284524800e..fefd0c7cdb 100644 --- a/webrtc/rtc_base/copyonwritebuffer_unittest.cc +++ b/webrtc/rtc_base/copyonwritebuffer_unittest.cc @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/rtc_base/copyonwritebuffer.h" -#include "webrtc/rtc_base/gunit.h" +#include "webrtc/base/copyonwritebuffer.h" +#include "webrtc/base/gunit.h" namespace rtc { diff --git a/webrtc/rtc_base/cpu_time.cc b/webrtc/rtc_base/cpu_time.cc index 41ac4caef2..5fce36654e 100644 --- a/webrtc/rtc_base/cpu_time.cc +++ b/webrtc/rtc_base/cpu_time.cc @@ -8,9 +8,9 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/rtc_base/cpu_time.h" -#include "webrtc/rtc_base/logging.h" -#include "webrtc/rtc_base/timeutils.h" +#include "webrtc/base/cpu_time.h" +#include "webrtc/base/logging.h" +#include "webrtc/base/timeutils.h" #if defined(WEBRTC_LINUX) #include diff --git a/webrtc/rtc_base/cpu_time_unittest.cc b/webrtc/rtc_base/cpu_time_unittest.cc index a9af7ba209..bfdd7ef4e6 100644 --- a/webrtc/rtc_base/cpu_time_unittest.cc +++ b/webrtc/rtc_base/cpu_time_unittest.cc @@ -8,14 +8,14 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/rtc_base/cpu_time.h" -#include #include -#include "webrtc/rtc_base/platform_thread.h" -#include "webrtc/rtc_base/timeutils.h" +#include +#include "webrtc/base/cpu_time.h" +#include "webrtc/base/platform_thread.h" +#include "webrtc/base/timeutils.h" +#include "webrtc/test/gtest.h" #include "webrtc/system_wrappers/include/cpu_info.h" #include "webrtc/system_wrappers/include/sleep.h" -#include "webrtc/test/gtest.h" // Only run these tests on non-instrumented builds, because timing on // instrumented builds is unreliable, causing the test to be flaky. diff --git a/webrtc/rtc_base/crc32.cc b/webrtc/rtc_base/crc32.cc index 3db6b1b39d..97b82145d7 100644 --- a/webrtc/rtc_base/crc32.cc +++ b/webrtc/rtc_base/crc32.cc @@ -8,9 +8,9 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/rtc_base/crc32.h" +#include "webrtc/base/crc32.h" -#include "webrtc/rtc_base/arraysize.h" +#include "webrtc/base/arraysize.h" namespace rtc { diff --git a/webrtc/rtc_base/crc32.h b/webrtc/rtc_base/crc32.h index d8b121df09..a7228df31c 100644 --- a/webrtc/rtc_base/crc32.h +++ b/webrtc/rtc_base/crc32.h @@ -13,7 +13,7 @@ #include -#include "webrtc/rtc_base/basictypes.h" +#include "webrtc/base/basictypes.h" namespace rtc { diff --git a/webrtc/rtc_base/crc32_unittest.cc b/webrtc/rtc_base/crc32_unittest.cc index 49c56006d2..6da5c32378 100644 --- a/webrtc/rtc_base/crc32_unittest.cc +++ b/webrtc/rtc_base/crc32_unittest.cc @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/rtc_base/crc32.h" -#include "webrtc/rtc_base/gunit.h" +#include "webrtc/base/crc32.h" +#include "webrtc/base/gunit.h" #include diff --git a/webrtc/rtc_base/criticalsection.cc b/webrtc/rtc_base/criticalsection.cc index 08acb13317..5a7bc762a7 100644 --- a/webrtc/rtc_base/criticalsection.cc +++ b/webrtc/rtc_base/criticalsection.cc @@ -8,10 +8,10 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/rtc_base/criticalsection.h" +#include "webrtc/base/criticalsection.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/platform_thread.h" +#include "webrtc/base/checks.h" +#include "webrtc/base/platform_thread.h" // TODO(tommi): Split this file up to per-platform implementation files. diff --git a/webrtc/rtc_base/criticalsection.h b/webrtc/rtc_base/criticalsection.h index 38172d7e0c..20a23ce6e3 100644 --- a/webrtc/rtc_base/criticalsection.h +++ b/webrtc/rtc_base/criticalsection.h @@ -11,11 +11,11 @@ #ifndef WEBRTC_RTC_BASE_CRITICALSECTION_H_ #define WEBRTC_RTC_BASE_CRITICALSECTION_H_ -#include "webrtc/rtc_base/atomicops.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/constructormagic.h" -#include "webrtc/rtc_base/platform_thread_types.h" -#include "webrtc/rtc_base/thread_annotations.h" +#include "webrtc/base/atomicops.h" +#include "webrtc/base/checks.h" +#include "webrtc/base/constructormagic.h" +#include "webrtc/base/platform_thread_types.h" +#include "webrtc/base/thread_annotations.h" #include "webrtc/typedefs.h" #if defined(WEBRTC_WIN) diff --git a/webrtc/rtc_base/criticalsection_unittest.cc b/webrtc/rtc_base/criticalsection_unittest.cc index 672a6746a6..a16f4f2d4f 100644 --- a/webrtc/rtc_base/criticalsection_unittest.cc +++ b/webrtc/rtc_base/criticalsection_unittest.cc @@ -12,13 +12,13 @@ #include #include -#include "webrtc/rtc_base/arraysize.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/criticalsection.h" -#include "webrtc/rtc_base/event.h" -#include "webrtc/rtc_base/gunit.h" -#include "webrtc/rtc_base/platform_thread.h" -#include "webrtc/rtc_base/thread.h" +#include "webrtc/base/arraysize.h" +#include "webrtc/base/checks.h" +#include "webrtc/base/criticalsection.h" +#include "webrtc/base/event.h" +#include "webrtc/base/gunit.h" +#include "webrtc/base/platform_thread.h" +#include "webrtc/base/thread.h" namespace rtc { diff --git a/webrtc/rtc_base/cryptstring.cc b/webrtc/rtc_base/cryptstring.cc index 1df5407628..4b2a83fca9 100644 --- a/webrtc/rtc_base/cryptstring.cc +++ b/webrtc/rtc_base/cryptstring.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/rtc_base/cryptstring.h" +#include "webrtc/base/cryptstring.h" namespace rtc { diff --git a/webrtc/rtc_base/event.cc b/webrtc/rtc_base/event.cc index cddf677577..27506b3269 100644 --- a/webrtc/rtc_base/event.cc +++ b/webrtc/rtc_base/event.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/rtc_base/event.h" +#include "webrtc/base/event.h" #if defined(WEBRTC_WIN) #include @@ -20,7 +20,7 @@ #error "Must define either WEBRTC_WIN or WEBRTC_POSIX." #endif -#include "webrtc/rtc_base/checks.h" +#include "webrtc/base/checks.h" namespace rtc { diff --git a/webrtc/rtc_base/event.h b/webrtc/rtc_base/event.h index b3c0e7cdd7..ca43d4df57 100644 --- a/webrtc/rtc_base/event.h +++ b/webrtc/rtc_base/event.h @@ -11,9 +11,9 @@ #ifndef WEBRTC_RTC_BASE_EVENT_H_ #define WEBRTC_RTC_BASE_EVENT_H_ -#include "webrtc/rtc_base/constructormagic.h" +#include "webrtc/base/constructormagic.h" #if defined(WEBRTC_WIN) -#include "webrtc/rtc_base/win32.h" // NOLINT: consider this a system header. +#include "webrtc/base/win32.h" // NOLINT: consider this a system header. #elif defined(WEBRTC_POSIX) #include #else diff --git a/webrtc/rtc_base/event_tracer.cc b/webrtc/rtc_base/event_tracer.cc index 8a6a7d5731..cb7554a891 100644 --- a/webrtc/rtc_base/event_tracer.cc +++ b/webrtc/rtc_base/event_tracer.cc @@ -7,21 +7,21 @@ * in the file PATENTS. All contributing project authors may * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/rtc_base/event_tracer.h" +#include "webrtc/base/event_tracer.h" #include #include #include -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/criticalsection.h" -#include "webrtc/rtc_base/event.h" -#include "webrtc/rtc_base/logging.h" -#include "webrtc/rtc_base/platform_thread.h" -#include "webrtc/rtc_base/stringutils.h" -#include "webrtc/rtc_base/timeutils.h" -#include "webrtc/rtc_base/trace_event.h" +#include "webrtc/base/checks.h" +#include "webrtc/base/criticalsection.h" +#include "webrtc/base/event.h" +#include "webrtc/base/logging.h" +#include "webrtc/base/platform_thread.h" +#include "webrtc/base/stringutils.h" +#include "webrtc/base/timeutils.h" +#include "webrtc/base/trace_event.h" // This is a guesstimate that should be enough in most cases. static const size_t kEventLoggerArgsStrBufferInitialSize = 256; @@ -51,7 +51,7 @@ const unsigned char* EventTracer::GetCategoryEnabled(const char* name) { } // Arguments to this function (phase, etc.) are as defined in -// webrtc/rtc_base/trace_event.h. +// webrtc/base/trace_event.h. void EventTracer::AddTraceEvent(char phase, const unsigned char* category_enabled, const char* name, @@ -232,7 +232,7 @@ class EventLogger final { struct TraceArg { const char* name; unsigned char type; - // Copied from webrtc/rtc_base/trace_event.h TraceValueUnion. + // Copied from webrtc/base/trace_event.h TraceValueUnion. union TraceArgValue { bool as_bool; unsigned long long as_uint; diff --git a/webrtc/rtc_base/event_tracer_unittest.cc b/webrtc/rtc_base/event_tracer_unittest.cc index 527b4eb9e2..a16c0ef692 100644 --- a/webrtc/rtc_base/event_tracer_unittest.cc +++ b/webrtc/rtc_base/event_tracer_unittest.cc @@ -8,9 +8,9 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/rtc_base/event_tracer.h" +#include "webrtc/base/event_tracer.h" -#include "webrtc/rtc_base/trace_event.h" +#include "webrtc/base/trace_event.h" #include "webrtc/system_wrappers/include/static_instance.h" #include "webrtc/test/gtest.h" diff --git a/webrtc/rtc_base/event_unittest.cc b/webrtc/rtc_base/event_unittest.cc index 02da66f574..996ad2f95a 100644 --- a/webrtc/rtc_base/event_unittest.cc +++ b/webrtc/rtc_base/event_unittest.cc @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/rtc_base/event.h" -#include "webrtc/rtc_base/gunit.h" +#include "webrtc/base/event.h" +#include "webrtc/base/gunit.h" namespace rtc { diff --git a/webrtc/rtc_base/fakeclock.cc b/webrtc/rtc_base/fakeclock.cc index e9c3e9b348..d95408f6a8 100644 --- a/webrtc/rtc_base/fakeclock.cc +++ b/webrtc/rtc_base/fakeclock.cc @@ -8,10 +8,10 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/rtc_base/fakeclock.h" +#include "webrtc/base/fakeclock.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/messagequeue.h" +#include "webrtc/base/checks.h" +#include "webrtc/base/messagequeue.h" namespace rtc { diff --git a/webrtc/rtc_base/fakeclock.h b/webrtc/rtc_base/fakeclock.h index c5bdab19af..659ae10d7b 100644 --- a/webrtc/rtc_base/fakeclock.h +++ b/webrtc/rtc_base/fakeclock.h @@ -11,9 +11,9 @@ #ifndef WEBRTC_RTC_BASE_FAKECLOCK_H_ #define WEBRTC_RTC_BASE_FAKECLOCK_H_ -#include "webrtc/rtc_base/criticalsection.h" -#include "webrtc/rtc_base/timedelta.h" -#include "webrtc/rtc_base/timeutils.h" +#include "webrtc/base/criticalsection.h" +#include "webrtc/base/timedelta.h" +#include "webrtc/base/timeutils.h" namespace rtc { diff --git a/webrtc/rtc_base/fakenetwork.h b/webrtc/rtc_base/fakenetwork.h index 479540dabe..ef3b5da1e1 100644 --- a/webrtc/rtc_base/fakenetwork.h +++ b/webrtc/rtc_base/fakenetwork.h @@ -16,11 +16,11 @@ #include #include -#include "webrtc/rtc_base/messagehandler.h" -#include "webrtc/rtc_base/network.h" -#include "webrtc/rtc_base/socketaddress.h" -#include "webrtc/rtc_base/stringencode.h" -#include "webrtc/rtc_base/thread.h" +#include "webrtc/base/network.h" +#include "webrtc/base/messagehandler.h" +#include "webrtc/base/socketaddress.h" +#include "webrtc/base/stringencode.h" +#include "webrtc/base/thread.h" namespace rtc { diff --git a/webrtc/rtc_base/fakesslidentity.h b/webrtc/rtc_base/fakesslidentity.h index ae9eeb1684..cc23b318bb 100644 --- a/webrtc/rtc_base/fakesslidentity.h +++ b/webrtc/rtc_base/fakesslidentity.h @@ -15,9 +15,9 @@ #include #include -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/messagedigest.h" -#include "webrtc/rtc_base/sslidentity.h" +#include "webrtc/base/checks.h" +#include "webrtc/base/messagedigest.h" +#include "webrtc/base/sslidentity.h" namespace rtc { diff --git a/webrtc/rtc_base/file.cc b/webrtc/rtc_base/file.cc index c4c5e5a3c9..983eb8b8da 100644 --- a/webrtc/rtc_base/file.cc +++ b/webrtc/rtc_base/file.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/rtc_base/file.h" +#include "webrtc/base/file.h" #include diff --git a/webrtc/rtc_base/file.h b/webrtc/rtc_base/file.h index 50639c4d8d..7c82006d86 100644 --- a/webrtc/rtc_base/file.h +++ b/webrtc/rtc_base/file.h @@ -15,9 +15,9 @@ #include -#include "webrtc/rtc_base/constructormagic.h" -#include "webrtc/rtc_base/pathutils.h" -#include "webrtc/rtc_base/platform_file.h" +#include "webrtc/base/constructormagic.h" +#include "webrtc/base/pathutils.h" +#include "webrtc/base/platform_file.h" namespace rtc { diff --git a/webrtc/rtc_base/file_posix.cc b/webrtc/rtc_base/file_posix.cc index fab6dd3725..c386a34f77 100644 --- a/webrtc/rtc_base/file_posix.cc +++ b/webrtc/rtc_base/file_posix.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/rtc_base/file.h" +#include "webrtc/base/file.h" #include #include @@ -18,7 +18,7 @@ #include -#include "webrtc/rtc_base/checks.h" +#include "webrtc/base/checks.h" namespace rtc { diff --git a/webrtc/rtc_base/file_unittest.cc b/webrtc/rtc_base/file_unittest.cc index a052a6ebcf..99a5d5885a 100644 --- a/webrtc/rtc_base/file_unittest.cc +++ b/webrtc/rtc_base/file_unittest.cc @@ -12,13 +12,13 @@ #include #include -#include "webrtc/rtc_base/file.h" -#include "webrtc/rtc_base/gunit.h" +#include "webrtc/base/gunit.h" +#include "webrtc/base/file.h" #include "webrtc/test/testsupport/fileutils.h" #if defined(WEBRTC_WIN) -#include "webrtc/rtc_base/win32.h" +#include "webrtc/base/win32.h" #else // if defined(WEBRTC_WIN) diff --git a/webrtc/rtc_base/file_win.cc b/webrtc/rtc_base/file_win.cc index 6cb259a9de..71e6effde6 100644 --- a/webrtc/rtc_base/file_win.cc +++ b/webrtc/rtc_base/file_win.cc @@ -8,14 +8,14 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/rtc_base/file.h" +#include "webrtc/base/file.h" #include -#include "webrtc/rtc_base/win32.h" +#include "webrtc/base/win32.h" #include // NOLINT: win32.h should be considered a system header -#include "webrtc/rtc_base/checks.h" +#include "webrtc/base/checks.h" namespace rtc { diff --git a/webrtc/rtc_base/filerotatingstream.cc b/webrtc/rtc_base/filerotatingstream.cc index 37cd60776f..d1434de9dd 100644 --- a/webrtc/rtc_base/filerotatingstream.cc +++ b/webrtc/rtc_base/filerotatingstream.cc @@ -8,15 +8,15 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/rtc_base/filerotatingstream.h" +#include "webrtc/base/filerotatingstream.h" #include #include #include -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/fileutils.h" -#include "webrtc/rtc_base/pathutils.h" +#include "webrtc/base/checks.h" +#include "webrtc/base/fileutils.h" +#include "webrtc/base/pathutils.h" // Note: We use std::cerr for logging in the write paths of this stream to avoid // infinite loops when logging. diff --git a/webrtc/rtc_base/filerotatingstream.h b/webrtc/rtc_base/filerotatingstream.h index db8d1ac2bd..9a4820a27c 100644 --- a/webrtc/rtc_base/filerotatingstream.h +++ b/webrtc/rtc_base/filerotatingstream.h @@ -15,8 +15,8 @@ #include #include -#include "webrtc/rtc_base/constructormagic.h" -#include "webrtc/rtc_base/stream.h" +#include "webrtc/base/constructormagic.h" +#include "webrtc/base/stream.h" namespace rtc { diff --git a/webrtc/rtc_base/filerotatingstream_unittest.cc b/webrtc/rtc_base/filerotatingstream_unittest.cc index b5fcefb2de..9ce00dad57 100644 --- a/webrtc/rtc_base/filerotatingstream_unittest.cc +++ b/webrtc/rtc_base/filerotatingstream_unittest.cc @@ -10,12 +10,12 @@ #include -#include "webrtc/rtc_base/arraysize.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/filerotatingstream.h" -#include "webrtc/rtc_base/fileutils.h" -#include "webrtc/rtc_base/gunit.h" -#include "webrtc/rtc_base/pathutils.h" +#include "webrtc/base/arraysize.h" +#include "webrtc/base/checks.h" +#include "webrtc/base/filerotatingstream.h" +#include "webrtc/base/fileutils.h" +#include "webrtc/base/gunit.h" +#include "webrtc/base/pathutils.h" #include "webrtc/test/testsupport/fileutils.h" namespace rtc { diff --git a/webrtc/rtc_base/fileutils.cc b/webrtc/rtc_base/fileutils.cc index 9a97cda307..187da14994 100644 --- a/webrtc/rtc_base/fileutils.cc +++ b/webrtc/rtc_base/fileutils.cc @@ -8,17 +8,17 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/rtc_base/fileutils.h" +#include "webrtc/base/fileutils.h" -#include "webrtc/rtc_base/arraysize.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/pathutils.h" -#include "webrtc/rtc_base/stringutils.h" +#include "webrtc/base/arraysize.h" +#include "webrtc/base/checks.h" +#include "webrtc/base/pathutils.h" +#include "webrtc/base/stringutils.h" #if defined(WEBRTC_WIN) -#include "webrtc/rtc_base/win32filesystem.h" +#include "webrtc/base/win32filesystem.h" #else -#include "webrtc/rtc_base/unixfilesystem.h" +#include "webrtc/base/unixfilesystem.h" #endif #if !defined(WEBRTC_WIN) diff --git a/webrtc/rtc_base/fileutils.h b/webrtc/rtc_base/fileutils.h index b633a38270..17e810379c 100644 --- a/webrtc/rtc_base/fileutils.h +++ b/webrtc/rtc_base/fileutils.h @@ -21,9 +21,9 @@ #include #endif -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/constructormagic.h" -#include "webrtc/rtc_base/platform_file.h" +#include "webrtc/base/checks.h" +#include "webrtc/base/constructormagic.h" +#include "webrtc/base/platform_file.h" namespace rtc { diff --git a/webrtc/rtc_base/fileutils_unittest.cc b/webrtc/rtc_base/fileutils_unittest.cc index 80dadf76a1..c9650e229c 100644 --- a/webrtc/rtc_base/fileutils_unittest.cc +++ b/webrtc/rtc_base/fileutils_unittest.cc @@ -10,10 +10,10 @@ #include -#include "webrtc/rtc_base/fileutils.h" -#include "webrtc/rtc_base/gunit.h" -#include "webrtc/rtc_base/pathutils.h" -#include "webrtc/rtc_base/stream.h" +#include "webrtc/base/fileutils.h" +#include "webrtc/base/gunit.h" +#include "webrtc/base/pathutils.h" +#include "webrtc/base/stream.h" namespace rtc { diff --git a/webrtc/rtc_base/firewallsocketserver.cc b/webrtc/rtc_base/firewallsocketserver.cc index b60a9435fb..4a2a4048f3 100644 --- a/webrtc/rtc_base/firewallsocketserver.cc +++ b/webrtc/rtc_base/firewallsocketserver.cc @@ -8,13 +8,13 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/rtc_base/firewallsocketserver.h" +#include "webrtc/base/firewallsocketserver.h" #include -#include "webrtc/rtc_base/asyncsocket.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/logging.h" +#include "webrtc/base/asyncsocket.h" +#include "webrtc/base/checks.h" +#include "webrtc/base/logging.h" namespace rtc { diff --git a/webrtc/rtc_base/firewallsocketserver.h b/webrtc/rtc_base/firewallsocketserver.h index d78a241001..5c3abdcf18 100644 --- a/webrtc/rtc_base/firewallsocketserver.h +++ b/webrtc/rtc_base/firewallsocketserver.h @@ -12,8 +12,8 @@ #define WEBRTC_RTC_BASE_FIREWALLSOCKETSERVER_H_ #include -#include "webrtc/rtc_base/criticalsection.h" -#include "webrtc/rtc_base/socketserver.h" +#include "webrtc/base/socketserver.h" +#include "webrtc/base/criticalsection.h" namespace rtc { diff --git a/webrtc/rtc_base/flags.cc b/webrtc/rtc_base/flags.cc index 19d2f827fd..9b7177c22c 100644 --- a/webrtc/rtc_base/flags.cc +++ b/webrtc/rtc_base/flags.cc @@ -8,17 +8,17 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/rtc_base/flags.h" +#include "webrtc/base/flags.h" #include #include #include -#include "webrtc/rtc_base/checks.h" +#include "webrtc/base/checks.h" #if defined(WEBRTC_WIN) +#include "webrtc/base/win32.h" #include -#include "webrtc/rtc_base/win32.h" #endif namespace rtc { diff --git a/webrtc/rtc_base/flags.h b/webrtc/rtc_base/flags.h index b2d8b76c5a..3d4527ced8 100644 --- a/webrtc/rtc_base/flags.h +++ b/webrtc/rtc_base/flags.h @@ -23,8 +23,8 @@ #ifndef WEBRTC_RTC_BASE_FLAGS_H_ #define WEBRTC_RTC_BASE_FLAGS_H_ -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/constructormagic.h" +#include "webrtc/base/checks.h" +#include "webrtc/base/constructormagic.h" namespace rtc { diff --git a/webrtc/rtc_base/function_view.h b/webrtc/rtc_base/function_view.h index a187d55df5..56964a6473 100644 --- a/webrtc/rtc_base/function_view.h +++ b/webrtc/rtc_base/function_view.h @@ -14,7 +14,7 @@ #include #include -#include "webrtc/rtc_base/checks.h" +#include "webrtc/base/checks.h" // Just like std::function, FunctionView will wrap any callable and hide its // actual type, exposing only its signature. But unlike std::function, diff --git a/webrtc/rtc_base/function_view_unittest.cc b/webrtc/rtc_base/function_view_unittest.cc index 00a8714322..c769fe65b2 100644 --- a/webrtc/rtc_base/function_view_unittest.cc +++ b/webrtc/rtc_base/function_view_unittest.cc @@ -11,8 +11,8 @@ #include #include -#include "webrtc/rtc_base/function_view.h" -#include "webrtc/rtc_base/gunit.h" +#include "webrtc/base/function_view.h" +#include "webrtc/base/gunit.h" namespace rtc { diff --git a/webrtc/rtc_base/gunit.h b/webrtc/rtc_base/gunit.h index 3260019e0a..b9b5a69349 100644 --- a/webrtc/rtc_base/gunit.h +++ b/webrtc/rtc_base/gunit.h @@ -11,9 +11,9 @@ #ifndef WEBRTC_RTC_BASE_GUNIT_H_ #define WEBRTC_RTC_BASE_GUNIT_H_ -#include "webrtc/rtc_base/fakeclock.h" -#include "webrtc/rtc_base/logging.h" -#include "webrtc/rtc_base/thread.h" +#include "webrtc/base/fakeclock.h" +#include "webrtc/base/logging.h" +#include "webrtc/base/thread.h" #if defined(GTEST_RELATIVE_PATH) #include "webrtc/test/gtest.h" #else diff --git a/webrtc/rtc_base/helpers.cc b/webrtc/rtc_base/helpers.cc index f7b1fa8d63..aa6a6aea18 100644 --- a/webrtc/rtc_base/helpers.cc +++ b/webrtc/rtc_base/helpers.cc @@ -8,18 +8,18 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/rtc_base/helpers.h" +#include "webrtc/base/helpers.h" #include #include #include -#include "webrtc/rtc_base/base64.h" -#include "webrtc/rtc_base/basictypes.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/logging.h" -#include "webrtc/rtc_base/timeutils.h" +#include "webrtc/base/base64.h" +#include "webrtc/base/basictypes.h" +#include "webrtc/base/checks.h" +#include "webrtc/base/logging.h" +#include "webrtc/base/timeutils.h" // Protect against max macro inclusion. #undef max diff --git a/webrtc/rtc_base/helpers.h b/webrtc/rtc_base/helpers.h index fac26538be..0a4298affe 100644 --- a/webrtc/rtc_base/helpers.h +++ b/webrtc/rtc_base/helpers.h @@ -12,7 +12,7 @@ #define WEBRTC_RTC_BASE_HELPERS_H_ #include -#include "webrtc/rtc_base/basictypes.h" +#include "webrtc/base/basictypes.h" namespace rtc { diff --git a/webrtc/rtc_base/helpers_unittest.cc b/webrtc/rtc_base/helpers_unittest.cc index d5c0ceaa3d..394e2b0dd4 100644 --- a/webrtc/rtc_base/helpers_unittest.cc +++ b/webrtc/rtc_base/helpers_unittest.cc @@ -10,10 +10,10 @@ #include -#include "webrtc/rtc_base/buffer.h" -#include "webrtc/rtc_base/gunit.h" -#include "webrtc/rtc_base/helpers.h" -#include "webrtc/rtc_base/ssladapter.h" +#include "webrtc/base/buffer.h" +#include "webrtc/base/gunit.h" +#include "webrtc/base/helpers.h" +#include "webrtc/base/ssladapter.h" namespace rtc { diff --git a/webrtc/rtc_base/httpbase.cc b/webrtc/rtc_base/httpbase.cc index 64cb5d9f09..bc8ac64c71 100644 --- a/webrtc/rtc_base/httpbase.cc +++ b/webrtc/rtc_base/httpbase.cc @@ -11,17 +11,17 @@ #include #if defined(WEBRTC_WIN) -#include "webrtc/rtc_base/win32.h" +#include "webrtc/base/win32.h" #else // !WEBRTC_WIN #define SEC_E_CERT_EXPIRED (-2146893016) #endif // !WEBRTC_WIN -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/httpbase.h" -#include "webrtc/rtc_base/logging.h" -#include "webrtc/rtc_base/socket.h" -#include "webrtc/rtc_base/stringutils.h" -#include "webrtc/rtc_base/thread.h" +#include "webrtc/base/checks.h" +#include "webrtc/base/httpbase.h" +#include "webrtc/base/logging.h" +#include "webrtc/base/socket.h" +#include "webrtc/base/stringutils.h" +#include "webrtc/base/thread.h" namespace rtc { diff --git a/webrtc/rtc_base/httpbase.h b/webrtc/rtc_base/httpbase.h index 5086502ae9..d5730ba927 100644 --- a/webrtc/rtc_base/httpbase.h +++ b/webrtc/rtc_base/httpbase.h @@ -12,7 +12,7 @@ #ifndef WEBRTC_RTC_BASE_HTTPBASE_H_ #define WEBRTC_RTC_BASE_HTTPBASE_H_ -#include "webrtc/rtc_base/httpcommon.h" +#include "webrtc/base/httpcommon.h" namespace rtc { diff --git a/webrtc/rtc_base/httpbase_unittest.cc b/webrtc/rtc_base/httpbase_unittest.cc index 37a6b26781..11fa8212b8 100644 --- a/webrtc/rtc_base/httpbase_unittest.cc +++ b/webrtc/rtc_base/httpbase_unittest.cc @@ -10,9 +10,9 @@ #include -#include "webrtc/rtc_base/gunit.h" -#include "webrtc/rtc_base/httpbase.h" -#include "webrtc/rtc_base/testutils.h" +#include "webrtc/base/gunit.h" +#include "webrtc/base/httpbase.h" +#include "webrtc/base/testutils.h" namespace rtc { diff --git a/webrtc/rtc_base/httpcommon-inl.h b/webrtc/rtc_base/httpcommon-inl.h index f0b02427fc..c324831463 100644 --- a/webrtc/rtc_base/httpcommon-inl.h +++ b/webrtc/rtc_base/httpcommon-inl.h @@ -11,9 +11,9 @@ #ifndef WEBRTC_RTC_BASE_HTTPCOMMON_INL_H_ #define WEBRTC_RTC_BASE_HTTPCOMMON_INL_H_ -#include "webrtc/rtc_base/arraysize.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/httpcommon.h" +#include "webrtc/base/arraysize.h" +#include "webrtc/base/checks.h" +#include "webrtc/base/httpcommon.h" namespace rtc { diff --git a/webrtc/rtc_base/httpcommon.cc b/webrtc/rtc_base/httpcommon.cc index a45d922ee9..031505b7f9 100644 --- a/webrtc/rtc_base/httpcommon.cc +++ b/webrtc/rtc_base/httpcommon.cc @@ -21,16 +21,16 @@ #include -#include "webrtc/rtc_base/arraysize.h" -#include "webrtc/rtc_base/base64.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/cryptstring.h" -#include "webrtc/rtc_base/httpcommon-inl.h" -#include "webrtc/rtc_base/httpcommon.h" -#include "webrtc/rtc_base/messagedigest.h" -#include "webrtc/rtc_base/socketaddress.h" -#include "webrtc/rtc_base/stringencode.h" -#include "webrtc/rtc_base/stringutils.h" +#include "webrtc/base/arraysize.h" +#include "webrtc/base/base64.h" +#include "webrtc/base/checks.h" +#include "webrtc/base/cryptstring.h" +#include "webrtc/base/httpcommon-inl.h" +#include "webrtc/base/httpcommon.h" +#include "webrtc/base/messagedigest.h" +#include "webrtc/base/socketaddress.h" +#include "webrtc/base/stringencode.h" +#include "webrtc/base/stringutils.h" namespace rtc { diff --git a/webrtc/rtc_base/httpcommon.h b/webrtc/rtc_base/httpcommon.h index bb96f984b2..12d18d5cff 100644 --- a/webrtc/rtc_base/httpcommon.h +++ b/webrtc/rtc_base/httpcommon.h @@ -15,10 +15,10 @@ #include #include #include -#include "webrtc/rtc_base/basictypes.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/stream.h" -#include "webrtc/rtc_base/stringutils.h" +#include "webrtc/base/basictypes.h" +#include "webrtc/base/checks.h" +#include "webrtc/base/stringutils.h" +#include "webrtc/base/stream.h" namespace rtc { diff --git a/webrtc/rtc_base/httpcommon_unittest.cc b/webrtc/rtc_base/httpcommon_unittest.cc index 2a4fe65088..10e378987a 100644 --- a/webrtc/rtc_base/httpcommon_unittest.cc +++ b/webrtc/rtc_base/httpcommon_unittest.cc @@ -8,9 +8,9 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/rtc_base/httpcommon.h" -#include "webrtc/rtc_base/gunit.h" -#include "webrtc/rtc_base/httpcommon-inl.h" +#include "webrtc/base/gunit.h" +#include "webrtc/base/httpcommon-inl.h" +#include "webrtc/base/httpcommon.h" namespace rtc { diff --git a/webrtc/rtc_base/httpserver.cc b/webrtc/rtc_base/httpserver.cc index 9d7aafd52f..b19069123b 100644 --- a/webrtc/rtc_base/httpserver.cc +++ b/webrtc/rtc_base/httpserver.cc @@ -10,14 +10,14 @@ #include -#include "webrtc/rtc_base/httpcommon-inl.h" +#include "webrtc/base/httpcommon-inl.h" -#include "webrtc/rtc_base/asyncsocket.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/httpserver.h" -#include "webrtc/rtc_base/logging.h" -#include "webrtc/rtc_base/socketstream.h" -#include "webrtc/rtc_base/thread.h" +#include "webrtc/base/asyncsocket.h" +#include "webrtc/base/checks.h" +#include "webrtc/base/httpserver.h" +#include "webrtc/base/logging.h" +#include "webrtc/base/socketstream.h" +#include "webrtc/base/thread.h" namespace rtc { diff --git a/webrtc/rtc_base/httpserver.h b/webrtc/rtc_base/httpserver.h index 0db78ddab0..a4acc4b49b 100644 --- a/webrtc/rtc_base/httpserver.h +++ b/webrtc/rtc_base/httpserver.h @@ -14,7 +14,7 @@ #include #include -#include "webrtc/rtc_base/httpbase.h" +#include "webrtc/base/httpbase.h" namespace rtc { diff --git a/webrtc/rtc_base/httpserver_unittest.cc b/webrtc/rtc_base/httpserver_unittest.cc index 1e5e0ff82f..4db4ad7cd1 100644 --- a/webrtc/rtc_base/httpserver_unittest.cc +++ b/webrtc/rtc_base/httpserver_unittest.cc @@ -8,9 +8,9 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/rtc_base/httpserver.h" -#include "webrtc/rtc_base/gunit.h" -#include "webrtc/rtc_base/testutils.h" +#include "webrtc/base/gunit.h" +#include "webrtc/base/httpserver.h" +#include "webrtc/base/testutils.h" using namespace webrtc::testing; diff --git a/webrtc/rtc_base/ifaddrs-android.cc b/webrtc/rtc_base/ifaddrs-android.cc index d2254572ed..f3c783834c 100644 --- a/webrtc/rtc_base/ifaddrs-android.cc +++ b/webrtc/rtc_base/ifaddrs-android.cc @@ -9,19 +9,19 @@ */ #if defined(WEBRTC_ANDROID) -#include "webrtc/rtc_base/ifaddrs-android.h" +#include "webrtc/base/ifaddrs-android.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include namespace { diff --git a/webrtc/rtc_base/ifaddrs_converter.cc b/webrtc/rtc_base/ifaddrs_converter.cc index b9660e0407..7dd35552f6 100644 --- a/webrtc/rtc_base/ifaddrs_converter.cc +++ b/webrtc/rtc_base/ifaddrs_converter.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/rtc_base/ifaddrs_converter.h" +#include "webrtc/base/ifaddrs_converter.h" namespace rtc { diff --git a/webrtc/rtc_base/ifaddrs_converter.h b/webrtc/rtc_base/ifaddrs_converter.h index 8a1fe69e4d..0cda8d491e 100644 --- a/webrtc/rtc_base/ifaddrs_converter.h +++ b/webrtc/rtc_base/ifaddrs_converter.h @@ -12,12 +12,12 @@ #define WEBRTC_RTC_BASE_IFADDRS_CONVERTER_H_ #if defined(WEBRTC_ANDROID) -#include "webrtc/rtc_base/ifaddrs-android.h" +#include "webrtc/base/ifaddrs-android.h" #else #include #endif // WEBRTC_ANDROID -#include "webrtc/rtc_base/ipaddress.h" +#include "webrtc/base/ipaddress.h" namespace rtc { diff --git a/webrtc/rtc_base/ipaddress.cc b/webrtc/rtc_base/ipaddress.cc index fa24bef63c..c06a1a7b05 100644 --- a/webrtc/rtc_base/ipaddress.cc +++ b/webrtc/rtc_base/ipaddress.cc @@ -25,13 +25,13 @@ #include -#include "webrtc/rtc_base/byteorder.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/ipaddress.h" -#include "webrtc/rtc_base/logging.h" -#include "webrtc/rtc_base/nethelpers.h" -#include "webrtc/rtc_base/stringutils.h" -#include "webrtc/rtc_base/win32.h" +#include "webrtc/base/ipaddress.h" +#include "webrtc/base/byteorder.h" +#include "webrtc/base/checks.h" +#include "webrtc/base/logging.h" +#include "webrtc/base/nethelpers.h" +#include "webrtc/base/stringutils.h" +#include "webrtc/base/win32.h" namespace rtc { diff --git a/webrtc/rtc_base/ipaddress.h b/webrtc/rtc_base/ipaddress.h index 7ccea2d452..e8a9f29d15 100644 --- a/webrtc/rtc_base/ipaddress.h +++ b/webrtc/rtc_base/ipaddress.h @@ -25,10 +25,10 @@ #include #include -#include "webrtc/rtc_base/basictypes.h" -#include "webrtc/rtc_base/byteorder.h" +#include "webrtc/base/basictypes.h" +#include "webrtc/base/byteorder.h" #if defined(WEBRTC_WIN) -#include "webrtc/rtc_base/win32.h" +#include "webrtc/base/win32.h" #endif namespace rtc { diff --git a/webrtc/rtc_base/ipaddress_unittest.cc b/webrtc/rtc_base/ipaddress_unittest.cc index 3389fef082..802b47b28e 100644 --- a/webrtc/rtc_base/ipaddress_unittest.cc +++ b/webrtc/rtc_base/ipaddress_unittest.cc @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/rtc_base/ipaddress.h" -#include "webrtc/rtc_base/gunit.h" +#include "webrtc/base/gunit.h" +#include "webrtc/base/ipaddress.h" namespace rtc { diff --git a/webrtc/rtc_base/json.cc b/webrtc/rtc_base/json.cc index 9a9968adb0..c692534c63 100644 --- a/webrtc/rtc_base/json.cc +++ b/webrtc/rtc_base/json.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/rtc_base/json.h" +#include "webrtc/base/json.h" #include #include diff --git a/webrtc/rtc_base/json_unittest.cc b/webrtc/rtc_base/json_unittest.cc index 5b65bc8b66..fe3cf3bb56 100644 --- a/webrtc/rtc_base/json_unittest.cc +++ b/webrtc/rtc_base/json_unittest.cc @@ -8,11 +8,11 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/rtc_base/json.h" +#include "webrtc/base/json.h" #include -#include "webrtc/rtc_base/gunit.h" +#include "webrtc/base/gunit.h" namespace rtc { diff --git a/webrtc/rtc_base/keep_ref_until_done.h b/webrtc/rtc_base/keep_ref_until_done.h index 79f361ccf3..e590e4c1ea 100644 --- a/webrtc/rtc_base/keep_ref_until_done.h +++ b/webrtc/rtc_base/keep_ref_until_done.h @@ -11,10 +11,10 @@ #ifndef WEBRTC_RTC_BASE_KEEP_REF_UNTIL_DONE_H_ #define WEBRTC_RTC_BASE_KEEP_REF_UNTIL_DONE_H_ -#include "webrtc/rtc_base/bind.h" -#include "webrtc/rtc_base/callback.h" -#include "webrtc/rtc_base/refcount.h" -#include "webrtc/rtc_base/scoped_ref_ptr.h" +#include "webrtc/base/bind.h" +#include "webrtc/base/callback.h" +#include "webrtc/base/refcount.h" +#include "webrtc/base/scoped_ref_ptr.h" namespace rtc { diff --git a/webrtc/rtc_base/location.cc b/webrtc/rtc_base/location.cc index 9b0a5f6d3a..c3dfe77222 100644 --- a/webrtc/rtc_base/location.cc +++ b/webrtc/rtc_base/location.cc @@ -8,9 +8,9 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/rtc_base/location.h" +#include "webrtc/base/location.h" -#include "webrtc/rtc_base/stringutils.h" +#include "webrtc/base/stringutils.h" namespace rtc { diff --git a/webrtc/rtc_base/location.h b/webrtc/rtc_base/location.h index dd1b1cafe3..6a4c9798c8 100644 --- a/webrtc/rtc_base/location.h +++ b/webrtc/rtc_base/location.h @@ -13,7 +13,7 @@ #include -#include "webrtc/rtc_base/stringize_macros.h" +#include "webrtc/base/stringize_macros.h" namespace rtc { diff --git a/webrtc/rtc_base/logging.cc b/webrtc/rtc_base/logging.cc index 4f46b0ad52..25f85c96a7 100644 --- a/webrtc/rtc_base/logging.cc +++ b/webrtc/rtc_base/logging.cc @@ -39,12 +39,12 @@ static const char kLibjingle[] = "libjingle"; #include #include -#include "webrtc/rtc_base/criticalsection.h" -#include "webrtc/rtc_base/logging.h" -#include "webrtc/rtc_base/platform_thread.h" -#include "webrtc/rtc_base/stringencode.h" -#include "webrtc/rtc_base/stringutils.h" -#include "webrtc/rtc_base/timeutils.h" +#include "webrtc/base/criticalsection.h" +#include "webrtc/base/logging.h" +#include "webrtc/base/platform_thread.h" +#include "webrtc/base/stringencode.h" +#include "webrtc/base/stringutils.h" +#include "webrtc/base/timeutils.h" namespace rtc { namespace { diff --git a/webrtc/rtc_base/logging.h b/webrtc/rtc_base/logging.h index 345e0d3bba..455aac0bf0 100644 --- a/webrtc/rtc_base/logging.h +++ b/webrtc/rtc_base/logging.h @@ -57,9 +57,9 @@ #include #endif -#include "webrtc/rtc_base/basictypes.h" -#include "webrtc/rtc_base/constructormagic.h" -#include "webrtc/rtc_base/thread_annotations.h" +#include "webrtc/base/basictypes.h" +#include "webrtc/base/constructormagic.h" +#include "webrtc/base/thread_annotations.h" namespace rtc { diff --git a/webrtc/rtc_base/logging_unittest.cc b/webrtc/rtc_base/logging_unittest.cc index 5e7f67c598..3d9fc9ee5b 100644 --- a/webrtc/rtc_base/logging_unittest.cc +++ b/webrtc/rtc_base/logging_unittest.cc @@ -8,12 +8,12 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/rtc_base/logging.h" -#include "webrtc/rtc_base/fileutils.h" -#include "webrtc/rtc_base/gunit.h" -#include "webrtc/rtc_base/pathutils.h" -#include "webrtc/rtc_base/stream.h" -#include "webrtc/rtc_base/thread.h" +#include "webrtc/base/fileutils.h" +#include "webrtc/base/gunit.h" +#include "webrtc/base/logging.h" +#include "webrtc/base/pathutils.h" +#include "webrtc/base/stream.h" +#include "webrtc/base/thread.h" namespace rtc { diff --git a/webrtc/rtc_base/logsinks.cc b/webrtc/rtc_base/logsinks.cc index ba0b5a51ec..5a6db45caa 100644 --- a/webrtc/rtc_base/logsinks.cc +++ b/webrtc/rtc_base/logsinks.cc @@ -8,12 +8,12 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/rtc_base/logsinks.h" +#include "webrtc/base/logsinks.h" #include #include -#include "webrtc/rtc_base/checks.h" +#include "webrtc/base/checks.h" namespace rtc { diff --git a/webrtc/rtc_base/logsinks.h b/webrtc/rtc_base/logsinks.h index e54d6ef608..bfc3703bc7 100644 --- a/webrtc/rtc_base/logsinks.h +++ b/webrtc/rtc_base/logsinks.h @@ -14,9 +14,9 @@ #include #include -#include "webrtc/rtc_base/constructormagic.h" -#include "webrtc/rtc_base/filerotatingstream.h" -#include "webrtc/rtc_base/logging.h" +#include "webrtc/base/constructormagic.h" +#include "webrtc/base/filerotatingstream.h" +#include "webrtc/base/logging.h" namespace rtc { diff --git a/webrtc/rtc_base/macifaddrs_converter.cc b/webrtc/rtc_base/macifaddrs_converter.cc index 44e1087870..2ad070e8ea 100644 --- a/webrtc/rtc_base/macifaddrs_converter.cc +++ b/webrtc/rtc_base/macifaddrs_converter.cc @@ -14,9 +14,9 @@ #include #include -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/ifaddrs_converter.h" -#include "webrtc/rtc_base/logging.h" +#include "webrtc/base/checks.h" +#include "webrtc/base/ifaddrs_converter.h" +#include "webrtc/base/logging.h" #if !defined(WEBRTC_IOS) #include diff --git a/webrtc/rtc_base/macutils.cc b/webrtc/rtc_base/macutils.cc index 282f7827a0..6e90722cf2 100644 --- a/webrtc/rtc_base/macutils.cc +++ b/webrtc/rtc_base/macutils.cc @@ -14,10 +14,10 @@ #include -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/logging.h" -#include "webrtc/rtc_base/macutils.h" -#include "webrtc/rtc_base/stringutils.h" +#include "webrtc/base/checks.h" +#include "webrtc/base/logging.h" +#include "webrtc/base/macutils.h" +#include "webrtc/base/stringutils.h" namespace rtc { diff --git a/webrtc/rtc_base/macutils_unittest.cc b/webrtc/rtc_base/macutils_unittest.cc index f5f4b8d4d8..d3e33e43b5 100644 --- a/webrtc/rtc_base/macutils_unittest.cc +++ b/webrtc/rtc_base/macutils_unittest.cc @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/rtc_base/macutils.h" -#include "webrtc/rtc_base/gunit.h" +#include "webrtc/base/gunit.h" +#include "webrtc/base/macutils.h" TEST(MacUtilsTest, GetOsVersionName) { rtc::MacOSVersionName ver = rtc::GetOSVersionName(); diff --git a/webrtc/rtc_base/mathutils.h b/webrtc/rtc_base/mathutils.h index e57697c497..3882c32803 100644 --- a/webrtc/rtc_base/mathutils.h +++ b/webrtc/rtc_base/mathutils.h @@ -14,7 +14,7 @@ #include #include -#include "webrtc/rtc_base/checks.h" +#include "webrtc/base/checks.h" #ifndef M_PI #define M_PI 3.14159265359f diff --git a/webrtc/rtc_base/md5.cc b/webrtc/rtc_base/md5.cc index be4cac900d..fda6ddd238 100644 --- a/webrtc/rtc_base/md5.cc +++ b/webrtc/rtc_base/md5.cc @@ -18,12 +18,12 @@ // Changes from original C code: // Ported to C++, type casting, Google code style. -#include "webrtc/rtc_base/md5.h" +#include "webrtc/base/md5.h" // TODO: Avoid memcmpy - hash directly from memory. #include // for memcpy(). -#include "webrtc/rtc_base/byteorder.h" // for RTC_ARCH_CPU_LITTLE_ENDIAN. +#include "webrtc/base/byteorder.h" // for RTC_ARCH_CPU_LITTLE_ENDIAN. namespace rtc { diff --git a/webrtc/rtc_base/md5digest.cc b/webrtc/rtc_base/md5digest.cc index 543de7d803..74f6bede29 100644 --- a/webrtc/rtc_base/md5digest.cc +++ b/webrtc/rtc_base/md5digest.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/rtc_base/md5digest.h" +#include "webrtc/base/md5digest.h" namespace rtc { diff --git a/webrtc/rtc_base/md5digest.h b/webrtc/rtc_base/md5digest.h index 2e7426dbea..be5b7d02dd 100644 --- a/webrtc/rtc_base/md5digest.h +++ b/webrtc/rtc_base/md5digest.h @@ -11,8 +11,8 @@ #ifndef WEBRTC_RTC_BASE_MD5DIGEST_H_ #define WEBRTC_RTC_BASE_MD5DIGEST_H_ -#include "webrtc/rtc_base/md5.h" -#include "webrtc/rtc_base/messagedigest.h" +#include "webrtc/base/md5.h" +#include "webrtc/base/messagedigest.h" namespace rtc { diff --git a/webrtc/rtc_base/md5digest_unittest.cc b/webrtc/rtc_base/md5digest_unittest.cc index f2f5ecaeee..67c62db628 100644 --- a/webrtc/rtc_base/md5digest_unittest.cc +++ b/webrtc/rtc_base/md5digest_unittest.cc @@ -8,9 +8,9 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/rtc_base/md5digest.h" -#include "webrtc/rtc_base/gunit.h" -#include "webrtc/rtc_base/stringencode.h" +#include "webrtc/base/md5digest.h" +#include "webrtc/base/gunit.h" +#include "webrtc/base/stringencode.h" namespace rtc { diff --git a/webrtc/rtc_base/memory_usage.cc b/webrtc/rtc_base/memory_usage.cc index 34fb910ee9..d37a702332 100644 --- a/webrtc/rtc_base/memory_usage.cc +++ b/webrtc/rtc_base/memory_usage.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/rtc_base/memory_usage.h" +#include "webrtc/base/memory_usage.h" #if defined(WEBRTC_LINUX) #include @@ -22,7 +22,7 @@ #include #endif -#include "webrtc/rtc_base/logging.h" +#include "webrtc/base/logging.h" namespace rtc { diff --git a/webrtc/rtc_base/memory_usage_unittest.cc b/webrtc/rtc_base/memory_usage_unittest.cc index 5b6224fde5..99857ec5e6 100644 --- a/webrtc/rtc_base/memory_usage_unittest.cc +++ b/webrtc/rtc_base/memory_usage_unittest.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/rtc_base/memory_usage.h" +#include "webrtc/base/memory_usage.h" #include #include "webrtc/test/gtest.h" diff --git a/webrtc/rtc_base/messagedigest.cc b/webrtc/rtc_base/messagedigest.cc index a72ae404ac..05c8c4f3da 100644 --- a/webrtc/rtc_base/messagedigest.cc +++ b/webrtc/rtc_base/messagedigest.cc @@ -8,15 +8,15 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/rtc_base/messagedigest.h" +#include "webrtc/base/messagedigest.h" #include #include -#include "webrtc/rtc_base/basictypes.h" -#include "webrtc/rtc_base/openssldigest.h" -#include "webrtc/rtc_base/stringencode.h" +#include "webrtc/base/basictypes.h" +#include "webrtc/base/openssldigest.h" +#include "webrtc/base/stringencode.h" namespace rtc { diff --git a/webrtc/rtc_base/messagedigest_unittest.cc b/webrtc/rtc_base/messagedigest_unittest.cc index ebc091a8cf..86cf688cec 100644 --- a/webrtc/rtc_base/messagedigest_unittest.cc +++ b/webrtc/rtc_base/messagedigest_unittest.cc @@ -8,9 +8,9 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/rtc_base/messagedigest.h" -#include "webrtc/rtc_base/gunit.h" -#include "webrtc/rtc_base/stringencode.h" +#include "webrtc/base/gunit.h" +#include "webrtc/base/messagedigest.h" +#include "webrtc/base/stringencode.h" namespace rtc { diff --git a/webrtc/rtc_base/messagehandler.cc b/webrtc/rtc_base/messagehandler.cc index 741049a9d4..be5bb7f8f9 100644 --- a/webrtc/rtc_base/messagehandler.cc +++ b/webrtc/rtc_base/messagehandler.cc @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/rtc_base/messagehandler.h" -#include "webrtc/rtc_base/messagequeue.h" +#include "webrtc/base/messagehandler.h" +#include "webrtc/base/messagequeue.h" namespace rtc { diff --git a/webrtc/rtc_base/messagehandler.h b/webrtc/rtc_base/messagehandler.h index 04e4b10781..8cb445766c 100644 --- a/webrtc/rtc_base/messagehandler.h +++ b/webrtc/rtc_base/messagehandler.h @@ -14,7 +14,7 @@ #include #include -#include "webrtc/rtc_base/constructormagic.h" +#include "webrtc/base/constructormagic.h" namespace rtc { diff --git a/webrtc/rtc_base/messagequeue.cc b/webrtc/rtc_base/messagequeue.cc index c22cea70e9..fce1906a41 100644 --- a/webrtc/rtc_base/messagequeue.cc +++ b/webrtc/rtc_base/messagequeue.cc @@ -9,13 +9,13 @@ */ #include -#include "webrtc/rtc_base/atomicops.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/logging.h" -#include "webrtc/rtc_base/messagequeue.h" -#include "webrtc/rtc_base/stringencode.h" -#include "webrtc/rtc_base/thread.h" -#include "webrtc/rtc_base/trace_event.h" +#include "webrtc/base/atomicops.h" +#include "webrtc/base/checks.h" +#include "webrtc/base/logging.h" +#include "webrtc/base/messagequeue.h" +#include "webrtc/base/stringencode.h" +#include "webrtc/base/thread.h" +#include "webrtc/base/trace_event.h" namespace rtc { namespace { diff --git a/webrtc/rtc_base/messagequeue.h b/webrtc/rtc_base/messagequeue.h index d4057cd2df..c8e247da47 100644 --- a/webrtc/rtc_base/messagequeue.h +++ b/webrtc/rtc_base/messagequeue.h @@ -20,16 +20,16 @@ #include #include -#include "webrtc/rtc_base/basictypes.h" -#include "webrtc/rtc_base/constructormagic.h" -#include "webrtc/rtc_base/criticalsection.h" -#include "webrtc/rtc_base/location.h" -#include "webrtc/rtc_base/messagehandler.h" -#include "webrtc/rtc_base/scoped_ref_ptr.h" -#include "webrtc/rtc_base/sigslot.h" -#include "webrtc/rtc_base/socketserver.h" -#include "webrtc/rtc_base/thread_annotations.h" -#include "webrtc/rtc_base/timeutils.h" +#include "webrtc/base/basictypes.h" +#include "webrtc/base/constructormagic.h" +#include "webrtc/base/criticalsection.h" +#include "webrtc/base/location.h" +#include "webrtc/base/messagehandler.h" +#include "webrtc/base/scoped_ref_ptr.h" +#include "webrtc/base/sigslot.h" +#include "webrtc/base/socketserver.h" +#include "webrtc/base/timeutils.h" +#include "webrtc/base/thread_annotations.h" namespace rtc { diff --git a/webrtc/rtc_base/messagequeue_unittest.cc b/webrtc/rtc_base/messagequeue_unittest.cc index 78bcfcbea9..9652bb38d5 100644 --- a/webrtc/rtc_base/messagequeue_unittest.cc +++ b/webrtc/rtc_base/messagequeue_unittest.cc @@ -8,18 +8,18 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/rtc_base/messagequeue.h" +#include "webrtc/base/messagequeue.h" #include -#include "webrtc/rtc_base/atomicops.h" -#include "webrtc/rtc_base/bind.h" -#include "webrtc/rtc_base/event.h" -#include "webrtc/rtc_base/gunit.h" -#include "webrtc/rtc_base/logging.h" -#include "webrtc/rtc_base/nullsocketserver.h" -#include "webrtc/rtc_base/thread.h" -#include "webrtc/rtc_base/timeutils.h" +#include "webrtc/base/atomicops.h" +#include "webrtc/base/bind.h" +#include "webrtc/base/event.h" +#include "webrtc/base/gunit.h" +#include "webrtc/base/logging.h" +#include "webrtc/base/thread.h" +#include "webrtc/base/timeutils.h" +#include "webrtc/base/nullsocketserver.h" using namespace rtc; diff --git a/webrtc/rtc_base/mod_ops.h b/webrtc/rtc_base/mod_ops.h index 211f2e3553..d51f127c7c 100644 --- a/webrtc/rtc_base/mod_ops.h +++ b/webrtc/rtc_base/mod_ops.h @@ -14,7 +14,7 @@ #include #include -#include "webrtc/rtc_base/checks.h" +#include "webrtc/base/checks.h" namespace webrtc { diff --git a/webrtc/rtc_base/mod_ops_unittest.cc b/webrtc/rtc_base/mod_ops_unittest.cc index c375305e2d..58c6a8e121 100644 --- a/webrtc/rtc_base/mod_ops_unittest.cc +++ b/webrtc/rtc_base/mod_ops_unittest.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/rtc_base/mod_ops.h" +#include "webrtc/base/mod_ops.h" #include "webrtc/test/gtest.h" namespace webrtc { diff --git a/webrtc/rtc_base/nat_unittest.cc b/webrtc/rtc_base/nat_unittest.cc index 7454028aec..b7ec16180d 100644 --- a/webrtc/rtc_base/nat_unittest.cc +++ b/webrtc/rtc_base/nat_unittest.cc @@ -12,17 +12,17 @@ #include #include -#include "webrtc/rtc_base/asynctcpsocket.h" -#include "webrtc/rtc_base/gunit.h" -#include "webrtc/rtc_base/logging.h" -#include "webrtc/rtc_base/natserver.h" -#include "webrtc/rtc_base/natsocketfactory.h" -#include "webrtc/rtc_base/nethelpers.h" -#include "webrtc/rtc_base/network.h" -#include "webrtc/rtc_base/physicalsocketserver.h" -#include "webrtc/rtc_base/ptr_util.h" -#include "webrtc/rtc_base/testclient.h" -#include "webrtc/rtc_base/virtualsocketserver.h" +#include "webrtc/base/asynctcpsocket.h" +#include "webrtc/base/gunit.h" +#include "webrtc/base/logging.h" +#include "webrtc/base/natserver.h" +#include "webrtc/base/natsocketfactory.h" +#include "webrtc/base/nethelpers.h" +#include "webrtc/base/network.h" +#include "webrtc/base/physicalsocketserver.h" +#include "webrtc/base/ptr_util.h" +#include "webrtc/base/testclient.h" +#include "webrtc/base/virtualsocketserver.h" using namespace rtc; diff --git a/webrtc/rtc_base/natserver.cc b/webrtc/rtc_base/natserver.cc index d3d1e143fc..e00bf9f7e5 100644 --- a/webrtc/rtc_base/natserver.cc +++ b/webrtc/rtc_base/natserver.cc @@ -10,11 +10,11 @@ #include -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/logging.h" -#include "webrtc/rtc_base/natserver.h" -#include "webrtc/rtc_base/natsocketfactory.h" -#include "webrtc/rtc_base/socketadapters.h" +#include "webrtc/base/checks.h" +#include "webrtc/base/natsocketfactory.h" +#include "webrtc/base/natserver.h" +#include "webrtc/base/logging.h" +#include "webrtc/base/socketadapters.h" namespace rtc { diff --git a/webrtc/rtc_base/natserver.h b/webrtc/rtc_base/natserver.h index fe901f9fd0..136cc04818 100644 --- a/webrtc/rtc_base/natserver.h +++ b/webrtc/rtc_base/natserver.h @@ -14,13 +14,13 @@ #include #include -#include "webrtc/rtc_base/asyncudpsocket.h" -#include "webrtc/rtc_base/constructormagic.h" -#include "webrtc/rtc_base/nattypes.h" -#include "webrtc/rtc_base/proxyserver.h" -#include "webrtc/rtc_base/socketaddresspair.h" -#include "webrtc/rtc_base/socketfactory.h" -#include "webrtc/rtc_base/thread.h" +#include "webrtc/base/asyncudpsocket.h" +#include "webrtc/base/constructormagic.h" +#include "webrtc/base/socketaddresspair.h" +#include "webrtc/base/thread.h" +#include "webrtc/base/socketfactory.h" +#include "webrtc/base/nattypes.h" +#include "webrtc/base/proxyserver.h" namespace rtc { diff --git a/webrtc/rtc_base/natsocketfactory.cc b/webrtc/rtc_base/natsocketfactory.cc index ad746d7b74..95e6487219 100644 --- a/webrtc/rtc_base/natsocketfactory.cc +++ b/webrtc/rtc_base/natsocketfactory.cc @@ -8,13 +8,13 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/rtc_base/natsocketfactory.h" +#include "webrtc/base/natsocketfactory.h" -#include "webrtc/rtc_base/arraysize.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/logging.h" -#include "webrtc/rtc_base/natserver.h" -#include "webrtc/rtc_base/virtualsocketserver.h" +#include "webrtc/base/arraysize.h" +#include "webrtc/base/checks.h" +#include "webrtc/base/logging.h" +#include "webrtc/base/natserver.h" +#include "webrtc/base/virtualsocketserver.h" namespace rtc { diff --git a/webrtc/rtc_base/natsocketfactory.h b/webrtc/rtc_base/natsocketfactory.h index 9e7cce01bb..c2f72a8483 100644 --- a/webrtc/rtc_base/natsocketfactory.h +++ b/webrtc/rtc_base/natsocketfactory.h @@ -16,10 +16,10 @@ #include #include -#include "webrtc/rtc_base/constructormagic.h" -#include "webrtc/rtc_base/natserver.h" -#include "webrtc/rtc_base/socketaddress.h" -#include "webrtc/rtc_base/socketserver.h" +#include "webrtc/base/constructormagic.h" +#include "webrtc/base/natserver.h" +#include "webrtc/base/socketaddress.h" +#include "webrtc/base/socketserver.h" namespace rtc { diff --git a/webrtc/rtc_base/nattypes.cc b/webrtc/rtc_base/nattypes.cc index 973569ba7b..1e37698f0d 100644 --- a/webrtc/rtc_base/nattypes.cc +++ b/webrtc/rtc_base/nattypes.cc @@ -8,9 +8,9 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/rtc_base/nattypes.h" +#include "webrtc/base/nattypes.h" -#include "webrtc/rtc_base/checks.h" +#include "webrtc/base/checks.h" namespace rtc { diff --git a/webrtc/rtc_base/nethelpers.cc b/webrtc/rtc_base/nethelpers.cc index 0f56416e22..6a411a6fc5 100644 --- a/webrtc/rtc_base/nethelpers.cc +++ b/webrtc/rtc_base/nethelpers.cc @@ -8,30 +8,30 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/rtc_base/nethelpers.h" +#include "webrtc/base/nethelpers.h" #include #if defined(WEBRTC_WIN) #include #include -#include "webrtc/rtc_base/win32.h" +#include "webrtc/base/win32.h" #endif #if defined(WEBRTC_POSIX) && !defined(__native_client__) #if defined(WEBRTC_ANDROID) -#include "webrtc/rtc_base/ifaddrs-android.h" +#include "webrtc/base/ifaddrs-android.h" #else #include #endif #endif // defined(WEBRTC_POSIX) && !defined(__native_client__) -#include "webrtc/rtc_base/bind.h" -#include "webrtc/rtc_base/byteorder.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/logging.h" -#include "webrtc/rtc_base/ptr_util.h" -#include "webrtc/rtc_base/task_queue.h" -#include "webrtc/rtc_base/thread.h" +#include "webrtc/base/bind.h" +#include "webrtc/base/byteorder.h" +#include "webrtc/base/checks.h" +#include "webrtc/base/logging.h" +#include "webrtc/base/ptr_util.h" +#include "webrtc/base/task_queue.h" +#include "webrtc/base/thread.h" namespace rtc { diff --git a/webrtc/rtc_base/nethelpers.h b/webrtc/rtc_base/nethelpers.h index b5f0c01a5c..99d0602943 100644 --- a/webrtc/rtc_base/nethelpers.h +++ b/webrtc/rtc_base/nethelpers.h @@ -21,12 +21,12 @@ #include #include -#include "webrtc/rtc_base/asyncresolverinterface.h" -#include "webrtc/rtc_base/refcount.h" -#include "webrtc/rtc_base/scoped_ref_ptr.h" -#include "webrtc/rtc_base/sigslot.h" -#include "webrtc/rtc_base/socketaddress.h" -#include "webrtc/rtc_base/thread_checker.h" +#include "webrtc/base/asyncresolverinterface.h" +#include "webrtc/base/refcount.h" +#include "webrtc/base/scoped_ref_ptr.h" +#include "webrtc/base/sigslot.h" +#include "webrtc/base/socketaddress.h" +#include "webrtc/base/thread_checker.h" namespace rtc { diff --git a/webrtc/rtc_base/network.cc b/webrtc/rtc_base/network.cc index add4c5d26b..69dc28ccd2 100644 --- a/webrtc/rtc_base/network.cc +++ b/webrtc/rtc_base/network.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/rtc_base/network.h" +#include "webrtc/base/network.h" #if defined(WEBRTC_POSIX) // linux/if.h can't be included at the same time as the posix sys/if.h, and @@ -23,10 +23,10 @@ #endif // WEBRTC_POSIX #if defined(WEBRTC_WIN) +#include "webrtc/base/win32.h" #include -#include "webrtc/rtc_base/win32.h" #elif !defined(__native_client__) -#include "webrtc/rtc_base/ifaddrs_converter.h" +#include "webrtc/base/ifaddrs_converter.h" #endif #include @@ -34,13 +34,13 @@ #include #include -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/logging.h" -#include "webrtc/rtc_base/networkmonitor.h" -#include "webrtc/rtc_base/socket.h" // includes something that makes windows happy -#include "webrtc/rtc_base/stream.h" -#include "webrtc/rtc_base/stringencode.h" -#include "webrtc/rtc_base/thread.h" +#include "webrtc/base/checks.h" +#include "webrtc/base/logging.h" +#include "webrtc/base/networkmonitor.h" +#include "webrtc/base/socket.h" // includes something that makes windows happy +#include "webrtc/base/stream.h" +#include "webrtc/base/stringencode.h" +#include "webrtc/base/thread.h" namespace rtc { namespace { diff --git a/webrtc/rtc_base/network.h b/webrtc/rtc_base/network.h index 6f820bb4de..17574f6001 100644 --- a/webrtc/rtc_base/network.h +++ b/webrtc/rtc_base/network.h @@ -19,10 +19,10 @@ #include #include -#include "webrtc/rtc_base/ipaddress.h" -#include "webrtc/rtc_base/messagehandler.h" -#include "webrtc/rtc_base/networkmonitor.h" -#include "webrtc/rtc_base/sigslot.h" +#include "webrtc/base/ipaddress.h" +#include "webrtc/base/networkmonitor.h" +#include "webrtc/base/messagehandler.h" +#include "webrtc/base/sigslot.h" #if defined(WEBRTC_POSIX) struct ifaddrs; diff --git a/webrtc/rtc_base/network_unittest.cc b/webrtc/rtc_base/network_unittest.cc index 4240e06acc..27dab48195 100644 --- a/webrtc/rtc_base/network_unittest.cc +++ b/webrtc/rtc_base/network_unittest.cc @@ -8,21 +8,21 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/rtc_base/network.h" +#include "webrtc/base/network.h" +#include "webrtc/base/checks.h" +#include "webrtc/base/nethelpers.h" +#include "webrtc/base/networkmonitor.h" #include #include -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/nethelpers.h" -#include "webrtc/rtc_base/networkmonitor.h" #if defined(WEBRTC_POSIX) -#include #include -#include "webrtc/rtc_base/ifaddrs_converter.h" +#include +#include "webrtc/base/ifaddrs_converter.h" #endif // defined(WEBRTC_POSIX) -#include "webrtc/rtc_base/gunit.h" +#include "webrtc/base/gunit.h" #if defined(WEBRTC_WIN) -#include "webrtc/rtc_base/logging.h" // For LOG_GLE +#include "webrtc/base/logging.h" // For LOG_GLE #endif namespace rtc { diff --git a/webrtc/rtc_base/networkmonitor.cc b/webrtc/rtc_base/networkmonitor.cc index a23cc77e2c..e11e81294c 100644 --- a/webrtc/rtc_base/networkmonitor.cc +++ b/webrtc/rtc_base/networkmonitor.cc @@ -8,9 +8,9 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/rtc_base/networkmonitor.h" +#include "webrtc/base/networkmonitor.h" -#include "webrtc/rtc_base/checks.h" +#include "webrtc/base/checks.h" namespace { const uint32_t UPDATE_NETWORKS_MESSAGE = 1; diff --git a/webrtc/rtc_base/networkmonitor.h b/webrtc/rtc_base/networkmonitor.h index f7cef1bcf5..db976bfaa6 100644 --- a/webrtc/rtc_base/networkmonitor.h +++ b/webrtc/rtc_base/networkmonitor.h @@ -11,9 +11,9 @@ #ifndef WEBRTC_RTC_BASE_NETWORKMONITOR_H_ #define WEBRTC_RTC_BASE_NETWORKMONITOR_H_ -#include "webrtc/rtc_base/logging.h" -#include "webrtc/rtc_base/sigslot.h" -#include "webrtc/rtc_base/thread.h" +#include "webrtc/base/logging.h" +#include "webrtc/base/sigslot.h" +#include "webrtc/base/thread.h" namespace rtc { diff --git a/webrtc/rtc_base/nullsocketserver.cc b/webrtc/rtc_base/nullsocketserver.cc index 5c6538680e..5dfd49030d 100644 --- a/webrtc/rtc_base/nullsocketserver.cc +++ b/webrtc/rtc_base/nullsocketserver.cc @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/rtc_base/nullsocketserver.h" -#include "webrtc/rtc_base/checks.h" +#include "webrtc/base/checks.h" +#include "webrtc/base/nullsocketserver.h" namespace rtc { diff --git a/webrtc/rtc_base/nullsocketserver.h b/webrtc/rtc_base/nullsocketserver.h index 997a416216..f506e4c345 100644 --- a/webrtc/rtc_base/nullsocketserver.h +++ b/webrtc/rtc_base/nullsocketserver.h @@ -11,8 +11,8 @@ #ifndef WEBRTC_RTC_BASE_NULLSOCKETSERVER_H_ #define WEBRTC_RTC_BASE_NULLSOCKETSERVER_H_ -#include "webrtc/rtc_base/event.h" -#include "webrtc/rtc_base/socketserver.h" +#include "webrtc/base/event.h" +#include "webrtc/base/socketserver.h" namespace rtc { diff --git a/webrtc/rtc_base/nullsocketserver_unittest.cc b/webrtc/rtc_base/nullsocketserver_unittest.cc index 5908d32958..fb059c5e31 100644 --- a/webrtc/rtc_base/nullsocketserver_unittest.cc +++ b/webrtc/rtc_base/nullsocketserver_unittest.cc @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/rtc_base/nullsocketserver.h" -#include "webrtc/rtc_base/gunit.h" +#include "webrtc/base/gunit.h" +#include "webrtc/base/nullsocketserver.h" namespace rtc { diff --git a/webrtc/rtc_base/numerics/exp_filter.cc b/webrtc/rtc_base/numerics/exp_filter.cc index b3d961034c..a4754a64b3 100644 --- a/webrtc/rtc_base/numerics/exp_filter.cc +++ b/webrtc/rtc_base/numerics/exp_filter.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/rtc_base/numerics/exp_filter.h" +#include "webrtc/base/numerics/exp_filter.h" #include diff --git a/webrtc/rtc_base/numerics/exp_filter_unittest.cc b/webrtc/rtc_base/numerics/exp_filter_unittest.cc index 892db1e1c8..fbe88e072d 100644 --- a/webrtc/rtc_base/numerics/exp_filter_unittest.cc +++ b/webrtc/rtc_base/numerics/exp_filter_unittest.cc @@ -10,7 +10,7 @@ #include -#include "webrtc/rtc_base/numerics/exp_filter.h" +#include "webrtc/base/numerics/exp_filter.h" #include "webrtc/test/gtest.h" namespace rtc { diff --git a/webrtc/rtc_base/numerics/percentile_filter.h b/webrtc/rtc_base/numerics/percentile_filter.h index b514aab5bb..66391f0501 100644 --- a/webrtc/rtc_base/numerics/percentile_filter.h +++ b/webrtc/rtc_base/numerics/percentile_filter.h @@ -16,7 +16,7 @@ #include #include -#include "webrtc/rtc_base/checks.h" +#include "webrtc/base/checks.h" namespace webrtc { diff --git a/webrtc/rtc_base/numerics/percentile_filter_unittest.cc b/webrtc/rtc_base/numerics/percentile_filter_unittest.cc index 22d2085e45..23e63ecdec 100644 --- a/webrtc/rtc_base/numerics/percentile_filter_unittest.cc +++ b/webrtc/rtc_base/numerics/percentile_filter_unittest.cc @@ -11,8 +11,8 @@ #include #include -#include "webrtc/rtc_base/constructormagic.h" -#include "webrtc/rtc_base/numerics/percentile_filter.h" +#include "webrtc/base/constructormagic.h" +#include "webrtc/base/numerics/percentile_filter.h" #include "webrtc/test/gtest.h" namespace webrtc { diff --git a/webrtc/rtc_base/onetimeevent.h b/webrtc/rtc_base/onetimeevent.h index 37afba254c..f22a6dc282 100644 --- a/webrtc/rtc_base/onetimeevent.h +++ b/webrtc/rtc_base/onetimeevent.h @@ -11,7 +11,7 @@ #ifndef WEBRTC_RTC_BASE_ONETIMEEVENT_H_ #define WEBRTC_RTC_BASE_ONETIMEEVENT_H_ -#include "webrtc/rtc_base/criticalsection.h" +#include "webrtc/base/criticalsection.h" #include "webrtc/typedefs.h" namespace webrtc { diff --git a/webrtc/rtc_base/onetimeevent_unittest.cc b/webrtc/rtc_base/onetimeevent_unittest.cc index e4984e28f2..4ebc139b2a 100644 --- a/webrtc/rtc_base/onetimeevent_unittest.cc +++ b/webrtc/rtc_base/onetimeevent_unittest.cc @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/rtc_base/onetimeevent.h" -#include "webrtc/rtc_base/gunit.h" +#include "webrtc/base/gunit.h" +#include "webrtc/base/onetimeevent.h" namespace webrtc { diff --git a/webrtc/rtc_base/openssladapter.cc b/webrtc/rtc_base/openssladapter.cc index d0ed07adb0..9cc5ca9455 100644 --- a/webrtc/rtc_base/openssladapter.cc +++ b/webrtc/rtc_base/openssladapter.cc @@ -8,14 +8,14 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/rtc_base/openssladapter.h" +#include "webrtc/base/openssladapter.h" #if defined(WEBRTC_POSIX) #include #endif // Must be included first before openssl headers. -#include "webrtc/rtc_base/win32.h" // NOLINT +#include "webrtc/base/win32.h" // NOLINT #include #include @@ -25,14 +25,14 @@ #include #include -#include "webrtc/rtc_base/arraysize.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/logging.h" -#include "webrtc/rtc_base/openssl.h" -#include "webrtc/rtc_base/safe_conversions.h" -#include "webrtc/rtc_base/sslroots.h" -#include "webrtc/rtc_base/stringutils.h" -#include "webrtc/rtc_base/thread.h" +#include "webrtc/base/arraysize.h" +#include "webrtc/base/checks.h" +#include "webrtc/base/logging.h" +#include "webrtc/base/openssl.h" +#include "webrtc/base/safe_conversions.h" +#include "webrtc/base/sslroots.h" +#include "webrtc/base/stringutils.h" +#include "webrtc/base/thread.h" #ifndef OPENSSL_IS_BORINGSSL diff --git a/webrtc/rtc_base/openssladapter.h b/webrtc/rtc_base/openssladapter.h index 251714545d..7080b8b1fe 100644 --- a/webrtc/rtc_base/openssladapter.h +++ b/webrtc/rtc_base/openssladapter.h @@ -12,10 +12,10 @@ #define WEBRTC_RTC_BASE_OPENSSLADAPTER_H_ #include -#include "webrtc/rtc_base/buffer.h" -#include "webrtc/rtc_base/messagehandler.h" -#include "webrtc/rtc_base/messagequeue.h" -#include "webrtc/rtc_base/ssladapter.h" +#include "webrtc/base/buffer.h" +#include "webrtc/base/messagehandler.h" +#include "webrtc/base/messagequeue.h" +#include "webrtc/base/ssladapter.h" typedef struct ssl_st SSL; typedef struct ssl_ctx_st SSL_CTX; diff --git a/webrtc/rtc_base/openssldigest.cc b/webrtc/rtc_base/openssldigest.cc index fa27a464d2..3115074eb6 100644 --- a/webrtc/rtc_base/openssldigest.cc +++ b/webrtc/rtc_base/openssldigest.cc @@ -8,10 +8,10 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/rtc_base/openssldigest.h" +#include "webrtc/base/openssldigest.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/openssl.h" +#include "webrtc/base/checks.h" +#include "webrtc/base/openssl.h" namespace rtc { diff --git a/webrtc/rtc_base/openssldigest.h b/webrtc/rtc_base/openssldigest.h index ab4ca16a6b..05aded42f1 100644 --- a/webrtc/rtc_base/openssldigest.h +++ b/webrtc/rtc_base/openssldigest.h @@ -13,7 +13,7 @@ #include -#include "webrtc/rtc_base/messagedigest.h" +#include "webrtc/base/messagedigest.h" namespace rtc { diff --git a/webrtc/rtc_base/opensslidentity.cc b/webrtc/rtc_base/opensslidentity.cc index a6b6e1c38e..9495496ffe 100644 --- a/webrtc/rtc_base/opensslidentity.cc +++ b/webrtc/rtc_base/opensslidentity.cc @@ -8,12 +8,12 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/rtc_base/opensslidentity.h" +#include "webrtc/base/opensslidentity.h" #include // Must be included first before openssl headers. -#include "webrtc/rtc_base/win32.h" // NOLINT +#include "webrtc/base/win32.h" // NOLINT #include #include @@ -22,11 +22,11 @@ #include #include -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/helpers.h" -#include "webrtc/rtc_base/logging.h" -#include "webrtc/rtc_base/openssl.h" -#include "webrtc/rtc_base/openssldigest.h" +#include "webrtc/base/checks.h" +#include "webrtc/base/helpers.h" +#include "webrtc/base/logging.h" +#include "webrtc/base/openssl.h" +#include "webrtc/base/openssldigest.h" namespace rtc { diff --git a/webrtc/rtc_base/opensslidentity.h b/webrtc/rtc_base/opensslidentity.h index ed7c07299a..3d6c8106c2 100644 --- a/webrtc/rtc_base/opensslidentity.h +++ b/webrtc/rtc_base/opensslidentity.h @@ -17,9 +17,9 @@ #include #include -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/constructormagic.h" -#include "webrtc/rtc_base/sslidentity.h" +#include "webrtc/base/checks.h" +#include "webrtc/base/constructormagic.h" +#include "webrtc/base/sslidentity.h" typedef struct ssl_ctx_st SSL_CTX; diff --git a/webrtc/rtc_base/opensslstreamadapter.cc b/webrtc/rtc_base/opensslstreamadapter.cc index 1c0b57894a..d1c16a126e 100644 --- a/webrtc/rtc_base/opensslstreamadapter.cc +++ b/webrtc/rtc_base/opensslstreamadapter.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/rtc_base/opensslstreamadapter.h" +#include "webrtc/base/opensslstreamadapter.h" #include #include @@ -24,17 +24,17 @@ #include #include -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/logging.h" -#include "webrtc/rtc_base/openssl.h" -#include "webrtc/rtc_base/openssladapter.h" -#include "webrtc/rtc_base/openssldigest.h" -#include "webrtc/rtc_base/opensslidentity.h" -#include "webrtc/rtc_base/safe_conversions.h" -#include "webrtc/rtc_base/stream.h" -#include "webrtc/rtc_base/stringutils.h" -#include "webrtc/rtc_base/thread.h" -#include "webrtc/rtc_base/timeutils.h" +#include "webrtc/base/checks.h" +#include "webrtc/base/logging.h" +#include "webrtc/base/safe_conversions.h" +#include "webrtc/base/stream.h" +#include "webrtc/base/openssl.h" +#include "webrtc/base/openssladapter.h" +#include "webrtc/base/openssldigest.h" +#include "webrtc/base/opensslidentity.h" +#include "webrtc/base/stringutils.h" +#include "webrtc/base/timeutils.h" +#include "webrtc/base/thread.h" namespace { bool g_use_time_callback_for_testing = false; diff --git a/webrtc/rtc_base/opensslstreamadapter.h b/webrtc/rtc_base/opensslstreamadapter.h index 32518ce3d9..67c8046358 100644 --- a/webrtc/rtc_base/opensslstreamadapter.h +++ b/webrtc/rtc_base/opensslstreamadapter.h @@ -15,9 +15,9 @@ #include #include -#include "webrtc/rtc_base/buffer.h" -#include "webrtc/rtc_base/opensslidentity.h" -#include "webrtc/rtc_base/sslstreamadapter.h" +#include "webrtc/base/buffer.h" +#include "webrtc/base/sslstreamadapter.h" +#include "webrtc/base/opensslidentity.h" typedef struct ssl_st SSL; typedef struct ssl_ctx_st SSL_CTX; diff --git a/webrtc/rtc_base/optional.cc b/webrtc/rtc_base/optional.cc index 4b41a2d7fb..6bebdd5a19 100644 --- a/webrtc/rtc_base/optional.cc +++ b/webrtc/rtc_base/optional.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/rtc_base/optional.h" +#include "webrtc/base/optional.h" namespace rtc { namespace optional_internal { diff --git a/webrtc/rtc_base/optional.h b/webrtc/rtc_base/optional.h index 6871f3d93f..ab3abf9f88 100644 --- a/webrtc/rtc_base/optional.h +++ b/webrtc/rtc_base/optional.h @@ -20,9 +20,9 @@ #include #endif // UNIT_TEST -#include "webrtc/rtc_base/array_view.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/sanitizer.h" +#include "webrtc/base/array_view.h" +#include "webrtc/base/checks.h" +#include "webrtc/base/sanitizer.h" namespace rtc { diff --git a/webrtc/rtc_base/optional_unittest.cc b/webrtc/rtc_base/optional_unittest.cc index 8f2f7fd1f0..1303552ff4 100644 --- a/webrtc/rtc_base/optional_unittest.cc +++ b/webrtc/rtc_base/optional_unittest.cc @@ -14,8 +14,8 @@ #include #include -#include "webrtc/rtc_base/gunit.h" -#include "webrtc/rtc_base/optional.h" +#include "webrtc/base/gunit.h" +#include "webrtc/base/optional.h" namespace rtc { diff --git a/webrtc/rtc_base/optionsfile.cc b/webrtc/rtc_base/optionsfile.cc index e8401fb325..ae37877c58 100644 --- a/webrtc/rtc_base/optionsfile.cc +++ b/webrtc/rtc_base/optionsfile.cc @@ -8,13 +8,13 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/rtc_base/optionsfile.h" +#include "webrtc/base/optionsfile.h" #include -#include "webrtc/rtc_base/logging.h" -#include "webrtc/rtc_base/stream.h" -#include "webrtc/rtc_base/stringencode.h" +#include "webrtc/base/logging.h" +#include "webrtc/base/stream.h" +#include "webrtc/base/stringencode.h" namespace rtc { diff --git a/webrtc/rtc_base/optionsfile_unittest.cc b/webrtc/rtc_base/optionsfile_unittest.cc index 525c317a15..69bd719638 100644 --- a/webrtc/rtc_base/optionsfile_unittest.cc +++ b/webrtc/rtc_base/optionsfile_unittest.cc @@ -10,11 +10,11 @@ #include -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/fileutils.h" -#include "webrtc/rtc_base/gunit.h" -#include "webrtc/rtc_base/optionsfile.h" -#include "webrtc/rtc_base/pathutils.h" +#include "webrtc/base/checks.h" +#include "webrtc/base/fileutils.h" +#include "webrtc/base/gunit.h" +#include "webrtc/base/optionsfile.h" +#include "webrtc/base/pathutils.h" namespace rtc { diff --git a/webrtc/rtc_base/pathutils.cc b/webrtc/rtc_base/pathutils.cc index 8329f2a734..30367743bf 100644 --- a/webrtc/rtc_base/pathutils.cc +++ b/webrtc/rtc_base/pathutils.cc @@ -9,16 +9,16 @@ */ #if defined(WEBRTC_WIN) +#include "webrtc/base/win32.h" #include #include #include -#include "webrtc/rtc_base/win32.h" #endif // WEBRTC_WIN -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/logging.h" -#include "webrtc/rtc_base/pathutils.h" -#include "webrtc/rtc_base/stringutils.h" +#include "webrtc/base/checks.h" +#include "webrtc/base/logging.h" +#include "webrtc/base/pathutils.h" +#include "webrtc/base/stringutils.h" namespace rtc { diff --git a/webrtc/rtc_base/pathutils.h b/webrtc/rtc_base/pathutils.h index bce5addb26..20305ca27a 100644 --- a/webrtc/rtc_base/pathutils.h +++ b/webrtc/rtc_base/pathutils.h @@ -13,7 +13,7 @@ #include -#include "webrtc/rtc_base/checks.h" +#include "webrtc/base/checks.h" namespace rtc { diff --git a/webrtc/rtc_base/pathutils_unittest.cc b/webrtc/rtc_base/pathutils_unittest.cc index 390ae8a93d..b99bc1606e 100644 --- a/webrtc/rtc_base/pathutils_unittest.cc +++ b/webrtc/rtc_base/pathutils_unittest.cc @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/rtc_base/pathutils.h" -#include "webrtc/rtc_base/gunit.h" +#include "webrtc/base/pathutils.h" +#include "webrtc/base/gunit.h" TEST(Pathname, ReturnsDotForEmptyPathname) { const std::string kCWD = diff --git a/webrtc/rtc_base/physicalsocketserver.cc b/webrtc/rtc_base/physicalsocketserver.cc index 8c6c7ddab9..655d397913 100644 --- a/webrtc/rtc_base/physicalsocketserver.cc +++ b/webrtc/rtc_base/physicalsocketserver.cc @@ -7,7 +7,7 @@ * in the file PATENTS. All contributing project authors may * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/rtc_base/physicalsocketserver.h" +#include "webrtc/base/physicalsocketserver.h" #if defined(_MSC_VER) && _MSC_VER < 1300 #pragma warning(disable:4786) @@ -43,15 +43,15 @@ #include #include -#include "webrtc/rtc_base/arraysize.h" -#include "webrtc/rtc_base/basictypes.h" -#include "webrtc/rtc_base/byteorder.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/logging.h" -#include "webrtc/rtc_base/networkmonitor.h" -#include "webrtc/rtc_base/nullsocketserver.h" -#include "webrtc/rtc_base/timeutils.h" -#include "webrtc/rtc_base/win32socketinit.h" +#include "webrtc/base/arraysize.h" +#include "webrtc/base/basictypes.h" +#include "webrtc/base/byteorder.h" +#include "webrtc/base/checks.h" +#include "webrtc/base/logging.h" +#include "webrtc/base/networkmonitor.h" +#include "webrtc/base/nullsocketserver.h" +#include "webrtc/base/timeutils.h" +#include "webrtc/base/win32socketinit.h" #if defined(WEBRTC_POSIX) #include // for TCP_NODELAY diff --git a/webrtc/rtc_base/physicalsocketserver.h b/webrtc/rtc_base/physicalsocketserver.h index 680b4dd8dd..55433bde56 100644 --- a/webrtc/rtc_base/physicalsocketserver.h +++ b/webrtc/rtc_base/physicalsocketserver.h @@ -20,9 +20,9 @@ #include #include -#include "webrtc/rtc_base/criticalsection.h" -#include "webrtc/rtc_base/nethelpers.h" -#include "webrtc/rtc_base/socketserver.h" +#include "webrtc/base/nethelpers.h" +#include "webrtc/base/socketserver.h" +#include "webrtc/base/criticalsection.h" #if defined(WEBRTC_POSIX) typedef int SOCKET; diff --git a/webrtc/rtc_base/physicalsocketserver_unittest.cc b/webrtc/rtc_base/physicalsocketserver_unittest.cc index ee95c2367a..20e66ce2b6 100644 --- a/webrtc/rtc_base/physicalsocketserver_unittest.cc +++ b/webrtc/rtc_base/physicalsocketserver_unittest.cc @@ -12,13 +12,13 @@ #include #include -#include "webrtc/rtc_base/gunit.h" -#include "webrtc/rtc_base/logging.h" -#include "webrtc/rtc_base/networkmonitor.h" -#include "webrtc/rtc_base/physicalsocketserver.h" -#include "webrtc/rtc_base/socket_unittest.h" -#include "webrtc/rtc_base/testutils.h" -#include "webrtc/rtc_base/thread.h" +#include "webrtc/base/gunit.h" +#include "webrtc/base/logging.h" +#include "webrtc/base/networkmonitor.h" +#include "webrtc/base/physicalsocketserver.h" +#include "webrtc/base/socket_unittest.h" +#include "webrtc/base/testutils.h" +#include "webrtc/base/thread.h" namespace rtc { diff --git a/webrtc/rtc_base/platform_file.cc b/webrtc/rtc_base/platform_file.cc index acbac6f232..a00543cc33 100644 --- a/webrtc/rtc_base/platform_file.cc +++ b/webrtc/rtc_base/platform_file.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/rtc_base/platform_file.h" +#include "webrtc/base/platform_file.h" #if defined(WEBRTC_WIN) #include diff --git a/webrtc/rtc_base/platform_file.h b/webrtc/rtc_base/platform_file.h index 2a5f6edf45..ccb7bfc452 100644 --- a/webrtc/rtc_base/platform_file.h +++ b/webrtc/rtc_base/platform_file.h @@ -15,7 +15,7 @@ #include #if defined(WEBRTC_WIN) -#include "webrtc/rtc_base/win32.h" +#include "webrtc/base/win32.h" #endif namespace rtc { diff --git a/webrtc/rtc_base/platform_thread.cc b/webrtc/rtc_base/platform_thread.cc index f65743ee3d..d3a1a037fc 100644 --- a/webrtc/rtc_base/platform_thread.cc +++ b/webrtc/rtc_base/platform_thread.cc @@ -8,12 +8,12 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/rtc_base/platform_thread.h" +#include "webrtc/base/platform_thread.h" -#include "webrtc/rtc_base/atomicops.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/timeutils.h" -#include "webrtc/rtc_base/trace_event.h" +#include "webrtc/base/atomicops.h" +#include "webrtc/base/checks.h" +#include "webrtc/base/timeutils.h" +#include "webrtc/base/trace_event.h" #if defined(WEBRTC_LINUX) #include diff --git a/webrtc/rtc_base/platform_thread.h b/webrtc/rtc_base/platform_thread.h index 4121c970c7..84f2b67f77 100644 --- a/webrtc/rtc_base/platform_thread.h +++ b/webrtc/rtc_base/platform_thread.h @@ -13,10 +13,10 @@ #include -#include "webrtc/rtc_base/constructormagic.h" -#include "webrtc/rtc_base/event.h" -#include "webrtc/rtc_base/platform_thread_types.h" -#include "webrtc/rtc_base/thread_checker.h" +#include "webrtc/base/constructormagic.h" +#include "webrtc/base/event.h" +#include "webrtc/base/platform_thread_types.h" +#include "webrtc/base/thread_checker.h" namespace rtc { diff --git a/webrtc/rtc_base/platform_thread_unittest.cc b/webrtc/rtc_base/platform_thread_unittest.cc index ae1a1d0f39..415b9ebeb8 100644 --- a/webrtc/rtc_base/platform_thread_unittest.cc +++ b/webrtc/rtc_base/platform_thread_unittest.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/rtc_base/platform_thread.h" +#include "webrtc/base/platform_thread.h" #include "webrtc/system_wrappers/include/sleep.h" #include "webrtc/test/gtest.h" diff --git a/webrtc/rtc_base/proxy_unittest.cc b/webrtc/rtc_base/proxy_unittest.cc index f4b51ada0d..f7668b597c 100644 --- a/webrtc/rtc_base/proxy_unittest.cc +++ b/webrtc/rtc_base/proxy_unittest.cc @@ -10,13 +10,13 @@ #include #include -#include "webrtc/rtc_base/gunit.h" -#include "webrtc/rtc_base/httpserver.h" -#include "webrtc/rtc_base/proxyserver.h" -#include "webrtc/rtc_base/socketadapters.h" -#include "webrtc/rtc_base/testclient.h" -#include "webrtc/rtc_base/testechoserver.h" -#include "webrtc/rtc_base/virtualsocketserver.h" +#include "webrtc/base/gunit.h" +#include "webrtc/base/httpserver.h" +#include "webrtc/base/proxyserver.h" +#include "webrtc/base/socketadapters.h" +#include "webrtc/base/testclient.h" +#include "webrtc/base/testechoserver.h" +#include "webrtc/base/virtualsocketserver.h" using rtc::Socket; using rtc::Thread; diff --git a/webrtc/rtc_base/proxyinfo.cc b/webrtc/rtc_base/proxyinfo.cc index 8603f21f41..76c7708286 100644 --- a/webrtc/rtc_base/proxyinfo.cc +++ b/webrtc/rtc_base/proxyinfo.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/rtc_base/proxyinfo.h" +#include "webrtc/base/proxyinfo.h" namespace rtc { diff --git a/webrtc/rtc_base/proxyinfo.h b/webrtc/rtc_base/proxyinfo.h index 9b706425ef..89bb1b7870 100644 --- a/webrtc/rtc_base/proxyinfo.h +++ b/webrtc/rtc_base/proxyinfo.h @@ -12,8 +12,8 @@ #define WEBRTC_RTC_BASE_PROXYINFO_H_ #include -#include "webrtc/rtc_base/cryptstring.h" -#include "webrtc/rtc_base/socketaddress.h" +#include "webrtc/base/socketaddress.h" +#include "webrtc/base/cryptstring.h" namespace rtc { diff --git a/webrtc/rtc_base/proxyserver.cc b/webrtc/rtc_base/proxyserver.cc index 18dceac5be..713a98679a 100644 --- a/webrtc/rtc_base/proxyserver.cc +++ b/webrtc/rtc_base/proxyserver.cc @@ -8,12 +8,12 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/rtc_base/proxyserver.h" +#include "webrtc/base/proxyserver.h" #include -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/socketfactory.h" +#include "webrtc/base/checks.h" +#include "webrtc/base/socketfactory.h" namespace rtc { diff --git a/webrtc/rtc_base/proxyserver.h b/webrtc/rtc_base/proxyserver.h index 218d5b3065..2fba0fbd34 100644 --- a/webrtc/rtc_base/proxyserver.h +++ b/webrtc/rtc_base/proxyserver.h @@ -13,11 +13,11 @@ #include #include -#include "webrtc/rtc_base/asyncsocket.h" -#include "webrtc/rtc_base/constructormagic.h" -#include "webrtc/rtc_base/socketadapters.h" -#include "webrtc/rtc_base/socketaddress.h" -#include "webrtc/rtc_base/stream.h" +#include "webrtc/base/asyncsocket.h" +#include "webrtc/base/constructormagic.h" +#include "webrtc/base/socketadapters.h" +#include "webrtc/base/socketaddress.h" +#include "webrtc/base/stream.h" namespace rtc { diff --git a/webrtc/rtc_base/ptr_util_unittest.cc b/webrtc/rtc_base/ptr_util_unittest.cc index 5948c39661..22669c52f5 100644 --- a/webrtc/rtc_base/ptr_util_unittest.cc +++ b/webrtc/rtc_base/ptr_util_unittest.cc @@ -8,12 +8,12 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/rtc_base/ptr_util.h" +#include "webrtc/base/ptr_util.h" #include #include -#include "webrtc/rtc_base/gunit.h" +#include "webrtc/base/gunit.h" namespace rtc { diff --git a/webrtc/rtc_base/race_checker.cc b/webrtc/rtc_base/race_checker.cc index 93d563b5c6..92bdd7bdfd 100644 --- a/webrtc/rtc_base/race_checker.cc +++ b/webrtc/rtc_base/race_checker.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/rtc_base/race_checker.h" +#include "webrtc/base/race_checker.h" namespace rtc { diff --git a/webrtc/rtc_base/race_checker.h b/webrtc/rtc_base/race_checker.h index b49db534e3..a7c893c812 100644 --- a/webrtc/rtc_base/race_checker.h +++ b/webrtc/rtc_base/race_checker.h @@ -11,9 +11,9 @@ #ifndef WEBRTC_RTC_BASE_RACE_CHECKER_H_ #define WEBRTC_RTC_BASE_RACE_CHECKER_H_ -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/platform_thread.h" -#include "webrtc/rtc_base/thread_annotations.h" +#include "webrtc/base/checks.h" +#include "webrtc/base/platform_thread.h" +#include "webrtc/base/thread_annotations.h" namespace rtc { diff --git a/webrtc/rtc_base/random.cc b/webrtc/rtc_base/random.cc index c0cf7fea71..14a9faf5b3 100644 --- a/webrtc/rtc_base/random.cc +++ b/webrtc/rtc_base/random.cc @@ -7,11 +7,11 @@ * in the file PATENTS. All contributing project authors may * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/rtc_base/random.h" +#include "webrtc/base/random.h" #include -#include "webrtc/rtc_base/checks.h" +#include "webrtc/base/checks.h" namespace webrtc { diff --git a/webrtc/rtc_base/random.h b/webrtc/rtc_base/random.h index 1ee6e741a4..d8d157cf0d 100644 --- a/webrtc/rtc_base/random.h +++ b/webrtc/rtc_base/random.h @@ -13,9 +13,9 @@ #include -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/constructormagic.h" #include "webrtc/typedefs.h" +#include "webrtc/base/constructormagic.h" +#include "webrtc/base/checks.h" namespace webrtc { @@ -30,7 +30,7 @@ class Random { // Besides the quality of the random seed being poor, this also requires // the client to take on extra dependencies to generate a seed. // If we go for a static seed generator in Random, we can use something from - // webrtc/rtc_base and make sure that it works the same way across platforms. + // webrtc/base and make sure that it works the same way across platforms. // See also discussion here: https://codereview.webrtc.org/1623543002/ explicit Random(uint64_t seed); diff --git a/webrtc/rtc_base/random_unittest.cc b/webrtc/rtc_base/random_unittest.cc index 0af2733faa..704e81fb2f 100644 --- a/webrtc/rtc_base/random_unittest.cc +++ b/webrtc/rtc_base/random_unittest.cc @@ -13,8 +13,8 @@ #include #include -#include "webrtc/rtc_base/mathutils.h" // unsigned difference -#include "webrtc/rtc_base/random.h" +#include "webrtc/base/mathutils.h" // unsigned difference +#include "webrtc/base/random.h" #include "webrtc/test/gtest.h" namespace webrtc { diff --git a/webrtc/rtc_base/rate_limiter.cc b/webrtc/rtc_base/rate_limiter.cc index b2ee2c0c2c..9215fa0c7f 100644 --- a/webrtc/rtc_base/rate_limiter.cc +++ b/webrtc/rtc_base/rate_limiter.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/rtc_base/rate_limiter.h" +#include "webrtc/base/rate_limiter.h" #include "webrtc/system_wrappers/include/clock.h" namespace webrtc { diff --git a/webrtc/rtc_base/rate_limiter.h b/webrtc/rtc_base/rate_limiter.h index b4b9080faa..e13aad0f4b 100644 --- a/webrtc/rtc_base/rate_limiter.h +++ b/webrtc/rtc_base/rate_limiter.h @@ -13,9 +13,9 @@ #include -#include "webrtc/rtc_base/constructormagic.h" -#include "webrtc/rtc_base/criticalsection.h" -#include "webrtc/rtc_base/rate_statistics.h" +#include "webrtc/base/constructormagic.h" +#include "webrtc/base/criticalsection.h" +#include "webrtc/base/rate_statistics.h" namespace webrtc { diff --git a/webrtc/rtc_base/rate_limiter_unittest.cc b/webrtc/rtc_base/rate_limiter_unittest.cc index 64783990df..6d925670bf 100644 --- a/webrtc/rtc_base/rate_limiter_unittest.cc +++ b/webrtc/rtc_base/rate_limiter_unittest.cc @@ -11,10 +11,10 @@ #include #include -#include "webrtc/rtc_base/event.h" -#include "webrtc/rtc_base/platform_thread.h" -#include "webrtc/rtc_base/rate_limiter.h" -#include "webrtc/rtc_base/task_queue.h" +#include "webrtc/base/event.h" +#include "webrtc/base/platform_thread.h" +#include "webrtc/base/rate_limiter.h" +#include "webrtc/base/task_queue.h" #include "webrtc/system_wrappers/include/clock.h" #include "webrtc/test/gtest.h" diff --git a/webrtc/rtc_base/rate_statistics.cc b/webrtc/rtc_base/rate_statistics.cc index a218540f43..3122dbb3e6 100644 --- a/webrtc/rtc_base/rate_statistics.cc +++ b/webrtc/rtc_base/rate_statistics.cc @@ -8,11 +8,11 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/rtc_base/rate_statistics.h" +#include "webrtc/base/rate_statistics.h" #include -#include "webrtc/rtc_base/checks.h" +#include "webrtc/base/checks.h" namespace webrtc { diff --git a/webrtc/rtc_base/rate_statistics.h b/webrtc/rtc_base/rate_statistics.h index 7c4daeaa6e..0a3077bb8a 100644 --- a/webrtc/rtc_base/rate_statistics.h +++ b/webrtc/rtc_base/rate_statistics.h @@ -13,7 +13,7 @@ #include -#include "webrtc/rtc_base/optional.h" +#include "webrtc/base/optional.h" #include "webrtc/typedefs.h" namespace webrtc { diff --git a/webrtc/rtc_base/rate_statistics_unittest.cc b/webrtc/rtc_base/rate_statistics_unittest.cc index 23d1a3c407..06136f5254 100644 --- a/webrtc/rtc_base/rate_statistics_unittest.cc +++ b/webrtc/rtc_base/rate_statistics_unittest.cc @@ -10,7 +10,7 @@ #include -#include "webrtc/rtc_base/rate_statistics.h" +#include "webrtc/base/rate_statistics.h" #include "webrtc/test/gtest.h" namespace { diff --git a/webrtc/rtc_base/ratelimiter.cc b/webrtc/rtc_base/ratelimiter.cc index 7bf954f93c..c4a251d140 100644 --- a/webrtc/rtc_base/ratelimiter.cc +++ b/webrtc/rtc_base/ratelimiter.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/rtc_base/ratelimiter.h" +#include "webrtc/base/ratelimiter.h" namespace rtc { diff --git a/webrtc/rtc_base/ratelimiter_unittest.cc b/webrtc/rtc_base/ratelimiter_unittest.cc index 3962ea3208..b54a751b77 100644 --- a/webrtc/rtc_base/ratelimiter_unittest.cc +++ b/webrtc/rtc_base/ratelimiter_unittest.cc @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/rtc_base/ratelimiter.h" -#include "webrtc/rtc_base/gunit.h" +#include "webrtc/base/gunit.h" +#include "webrtc/base/ratelimiter.h" namespace rtc { diff --git a/webrtc/rtc_base/ratetracker.cc b/webrtc/rtc_base/ratetracker.cc index 731de8e663..a59ec2fc3f 100644 --- a/webrtc/rtc_base/ratetracker.cc +++ b/webrtc/rtc_base/ratetracker.cc @@ -8,14 +8,14 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/rtc_base/ratetracker.h" +#include "webrtc/base/ratetracker.h" #include #include -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/timeutils.h" +#include "webrtc/base/checks.h" +#include "webrtc/base/timeutils.h" namespace rtc { diff --git a/webrtc/rtc_base/ratetracker.h b/webrtc/rtc_base/ratetracker.h index 3731600c32..7cdf4a5dfb 100644 --- a/webrtc/rtc_base/ratetracker.h +++ b/webrtc/rtc_base/ratetracker.h @@ -12,7 +12,7 @@ #define WEBRTC_RTC_BASE_RATETRACKER_H_ #include -#include "webrtc/rtc_base/basictypes.h" +#include "webrtc/base/basictypes.h" namespace rtc { diff --git a/webrtc/rtc_base/ratetracker_unittest.cc b/webrtc/rtc_base/ratetracker_unittest.cc index 27aa3a9299..e2b51c1369 100644 --- a/webrtc/rtc_base/ratetracker_unittest.cc +++ b/webrtc/rtc_base/ratetracker_unittest.cc @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/rtc_base/ratetracker.h" -#include "webrtc/rtc_base/gunit.h" +#include "webrtc/base/gunit.h" +#include "webrtc/base/ratetracker.h" namespace rtc { namespace { diff --git a/webrtc/rtc_base/refcount.h b/webrtc/rtc_base/refcount.h index c3744d0776..d67e2871c6 100644 --- a/webrtc/rtc_base/refcount.h +++ b/webrtc/rtc_base/refcount.h @@ -10,7 +10,7 @@ #ifndef WEBRTC_RTC_BASE_REFCOUNT_H_ #define WEBRTC_RTC_BASE_REFCOUNT_H_ -#include "webrtc/rtc_base/refcountedobject.h" +#include "webrtc/base/refcountedobject.h" namespace rtc { diff --git a/webrtc/rtc_base/refcountedobject.h b/webrtc/rtc_base/refcountedobject.h index bf66af27a9..5c9e7f1dfd 100644 --- a/webrtc/rtc_base/refcountedobject.h +++ b/webrtc/rtc_base/refcountedobject.h @@ -12,7 +12,7 @@ #include -#include "webrtc/rtc_base/atomicops.h" +#include "webrtc/base/atomicops.h" namespace rtc { diff --git a/webrtc/rtc_base/refcountedobject_unittest.cc b/webrtc/rtc_base/refcountedobject_unittest.cc index 8b27e71808..f6096be879 100644 --- a/webrtc/rtc_base/refcountedobject_unittest.cc +++ b/webrtc/rtc_base/refcountedobject_unittest.cc @@ -10,8 +10,8 @@ #include -#include "webrtc/rtc_base/gunit.h" -#include "webrtc/rtc_base/refcount.h" +#include "webrtc/base/gunit.h" +#include "webrtc/base/refcount.h" namespace rtc { diff --git a/webrtc/rtc_base/rollingaccumulator.h b/webrtc/rtc_base/rollingaccumulator.h index 9008db6a7b..40b2611e1a 100644 --- a/webrtc/rtc_base/rollingaccumulator.h +++ b/webrtc/rtc_base/rollingaccumulator.h @@ -14,8 +14,8 @@ #include #include -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/constructormagic.h" +#include "webrtc/base/checks.h" +#include "webrtc/base/constructormagic.h" namespace rtc { diff --git a/webrtc/rtc_base/rollingaccumulator_unittest.cc b/webrtc/rtc_base/rollingaccumulator_unittest.cc index ce4b4df20e..7e3d8cdf0e 100644 --- a/webrtc/rtc_base/rollingaccumulator_unittest.cc +++ b/webrtc/rtc_base/rollingaccumulator_unittest.cc @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/rtc_base/rollingaccumulator.h" -#include "webrtc/rtc_base/gunit.h" +#include "webrtc/base/gunit.h" +#include "webrtc/base/rollingaccumulator.h" namespace rtc { diff --git a/webrtc/rtc_base/rtccertificate.cc b/webrtc/rtc_base/rtccertificate.cc index f5af47eb15..3b3b8c9e89 100644 --- a/webrtc/rtc_base/rtccertificate.cc +++ b/webrtc/rtc_base/rtccertificate.cc @@ -10,9 +10,9 @@ #include -#include "webrtc/rtc_base/rtccertificate.h" +#include "webrtc/base/rtccertificate.h" -#include "webrtc/rtc_base/checks.h" +#include "webrtc/base/checks.h" namespace rtc { diff --git a/webrtc/rtc_base/rtccertificate.h b/webrtc/rtc_base/rtccertificate.h index 141023f6ac..e97ca73b88 100644 --- a/webrtc/rtc_base/rtccertificate.h +++ b/webrtc/rtc_base/rtccertificate.h @@ -15,9 +15,9 @@ #include -#include "webrtc/rtc_base/refcount.h" -#include "webrtc/rtc_base/scoped_ref_ptr.h" -#include "webrtc/rtc_base/sslidentity.h" +#include "webrtc/base/refcount.h" +#include "webrtc/base/scoped_ref_ptr.h" +#include "webrtc/base/sslidentity.h" namespace rtc { diff --git a/webrtc/rtc_base/rtccertificate_unittest.cc b/webrtc/rtc_base/rtccertificate_unittest.cc index 348364d510..b318717790 100644 --- a/webrtc/rtc_base/rtccertificate_unittest.cc +++ b/webrtc/rtc_base/rtccertificate_unittest.cc @@ -11,15 +11,15 @@ #include #include -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/fakesslidentity.h" -#include "webrtc/rtc_base/gunit.h" -#include "webrtc/rtc_base/logging.h" -#include "webrtc/rtc_base/rtccertificate.h" -#include "webrtc/rtc_base/safe_conversions.h" -#include "webrtc/rtc_base/sslidentity.h" -#include "webrtc/rtc_base/thread.h" -#include "webrtc/rtc_base/timeutils.h" +#include "webrtc/base/checks.h" +#include "webrtc/base/fakesslidentity.h" +#include "webrtc/base/gunit.h" +#include "webrtc/base/logging.h" +#include "webrtc/base/rtccertificate.h" +#include "webrtc/base/safe_conversions.h" +#include "webrtc/base/sslidentity.h" +#include "webrtc/base/thread.h" +#include "webrtc/base/timeutils.h" namespace rtc { diff --git a/webrtc/rtc_base/rtccertificategenerator.cc b/webrtc/rtc_base/rtccertificategenerator.cc index 74e9336144..461a00cd09 100644 --- a/webrtc/rtc_base/rtccertificategenerator.cc +++ b/webrtc/rtc_base/rtccertificategenerator.cc @@ -8,13 +8,13 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/rtc_base/rtccertificategenerator.h" +#include "webrtc/base/rtccertificategenerator.h" #include #include -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/sslidentity.h" +#include "webrtc/base/checks.h" +#include "webrtc/base/sslidentity.h" namespace rtc { diff --git a/webrtc/rtc_base/rtccertificategenerator.h b/webrtc/rtc_base/rtccertificategenerator.h index 272a5d61f0..783ed78ebf 100644 --- a/webrtc/rtc_base/rtccertificategenerator.h +++ b/webrtc/rtc_base/rtccertificategenerator.h @@ -11,12 +11,12 @@ #ifndef WEBRTC_RTC_BASE_RTCCERTIFICATEGENERATOR_H_ #define WEBRTC_RTC_BASE_RTCCERTIFICATEGENERATOR_H_ -#include "webrtc/rtc_base/optional.h" -#include "webrtc/rtc_base/refcount.h" -#include "webrtc/rtc_base/rtccertificate.h" -#include "webrtc/rtc_base/scoped_ref_ptr.h" -#include "webrtc/rtc_base/sslidentity.h" -#include "webrtc/rtc_base/thread.h" +#include "webrtc/base/optional.h" +#include "webrtc/base/refcount.h" +#include "webrtc/base/rtccertificate.h" +#include "webrtc/base/scoped_ref_ptr.h" +#include "webrtc/base/sslidentity.h" +#include "webrtc/base/thread.h" namespace rtc { diff --git a/webrtc/rtc_base/rtccertificategenerator_unittest.cc b/webrtc/rtc_base/rtccertificategenerator_unittest.cc index f09f797974..8dc3cd2320 100644 --- a/webrtc/rtc_base/rtccertificategenerator_unittest.cc +++ b/webrtc/rtc_base/rtccertificategenerator_unittest.cc @@ -8,15 +8,15 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/rtc_base/rtccertificategenerator.h" +#include "webrtc/base/rtccertificategenerator.h" #include -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/gunit.h" -#include "webrtc/rtc_base/logging.h" -#include "webrtc/rtc_base/optional.h" -#include "webrtc/rtc_base/thread.h" +#include "webrtc/base/checks.h" +#include "webrtc/base/gunit.h" +#include "webrtc/base/logging.h" +#include "webrtc/base/optional.h" +#include "webrtc/base/thread.h" namespace rtc { diff --git a/webrtc/rtc_base/safe_compare.h b/webrtc/rtc_base/safe_compare.h index e9c622b24f..4eb11c24ba 100644 --- a/webrtc/rtc_base/safe_compare.h +++ b/webrtc/rtc_base/safe_compare.h @@ -37,7 +37,7 @@ #include #include -#include "webrtc/rtc_base/type_traits.h" +#include "webrtc/base/type_traits.h" namespace rtc { diff --git a/webrtc/rtc_base/safe_compare_unittest.cc b/webrtc/rtc_base/safe_compare_unittest.cc index 2a135a157c..1ebb7222e2 100644 --- a/webrtc/rtc_base/safe_compare_unittest.cc +++ b/webrtc/rtc_base/safe_compare_unittest.cc @@ -10,7 +10,7 @@ #include -#include "webrtc/rtc_base/safe_compare.h" +#include "webrtc/base/safe_compare.h" #include "webrtc/test/gtest.h" namespace rtc { diff --git a/webrtc/rtc_base/safe_conversions.h b/webrtc/rtc_base/safe_conversions.h index 877f28ad26..f8d73e7bc9 100644 --- a/webrtc/rtc_base/safe_conversions.h +++ b/webrtc/rtc_base/safe_conversions.h @@ -15,8 +15,8 @@ #include -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/safe_conversions_impl.h" +#include "webrtc/base/checks.h" +#include "webrtc/base/safe_conversions_impl.h" namespace rtc { diff --git a/webrtc/rtc_base/safe_minmax.h b/webrtc/rtc_base/safe_minmax.h index 77d75a14ec..bb60a3687b 100644 --- a/webrtc/rtc_base/safe_minmax.h +++ b/webrtc/rtc_base/safe_minmax.h @@ -79,9 +79,9 @@ #include #include -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/safe_compare.h" -#include "webrtc/rtc_base/type_traits.h" +#include "webrtc/base/checks.h" +#include "webrtc/base/safe_compare.h" +#include "webrtc/base/type_traits.h" namespace rtc { diff --git a/webrtc/rtc_base/safe_minmax_unittest.cc b/webrtc/rtc_base/safe_minmax_unittest.cc index a75b16d042..eb0fe809f7 100644 --- a/webrtc/rtc_base/safe_minmax_unittest.cc +++ b/webrtc/rtc_base/safe_minmax_unittest.cc @@ -11,7 +11,7 @@ #include #include -#include "webrtc/rtc_base/safe_minmax.h" +#include "webrtc/base/safe_minmax.h" #include "webrtc/test/gtest.h" namespace rtc { diff --git a/webrtc/rtc_base/sequenced_task_checker.h b/webrtc/rtc_base/sequenced_task_checker.h index 40b07f98e6..5e127c7f41 100644 --- a/webrtc/rtc_base/sequenced_task_checker.h +++ b/webrtc/rtc_base/sequenced_task_checker.h @@ -16,10 +16,10 @@ // with this define will get the same level of checking as debug bots. #define ENABLE_SEQUENCED_TASK_CHECKER RTC_DCHECK_IS_ON -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/constructormagic.h" -#include "webrtc/rtc_base/sequenced_task_checker_impl.h" -#include "webrtc/rtc_base/thread_annotations.h" +#include "webrtc/base/checks.h" +#include "webrtc/base/constructormagic.h" +#include "webrtc/base/thread_annotations.h" +#include "webrtc/base/sequenced_task_checker_impl.h" namespace rtc { diff --git a/webrtc/rtc_base/sequenced_task_checker_impl.cc b/webrtc/rtc_base/sequenced_task_checker_impl.cc index 0d2ae3ee34..f03e0b6796 100644 --- a/webrtc/rtc_base/sequenced_task_checker_impl.cc +++ b/webrtc/rtc_base/sequenced_task_checker_impl.cc @@ -8,15 +8,15 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/rtc_base/sequenced_task_checker_impl.h" +#include "webrtc/base/sequenced_task_checker_impl.h" #if defined(WEBRTC_MAC) #include #endif -#include "webrtc/rtc_base/platform_thread.h" -#include "webrtc/rtc_base/sequenced_task_checker.h" -#include "webrtc/rtc_base/task_queue.h" +#include "webrtc/base/platform_thread.h" +#include "webrtc/base/sequenced_task_checker.h" +#include "webrtc/base/task_queue.h" namespace rtc { diff --git a/webrtc/rtc_base/sequenced_task_checker_impl.h b/webrtc/rtc_base/sequenced_task_checker_impl.h index ac43030d22..8b9ec4c86e 100644 --- a/webrtc/rtc_base/sequenced_task_checker_impl.h +++ b/webrtc/rtc_base/sequenced_task_checker_impl.h @@ -11,7 +11,7 @@ #ifndef WEBRTC_RTC_BASE_SEQUENCED_TASK_CHECKER_IMPL_H_ #define WEBRTC_RTC_BASE_SEQUENCED_TASK_CHECKER_IMPL_H_ -#include "webrtc/rtc_base/thread_checker.h" +#include "webrtc/base/thread_checker.h" namespace rtc { diff --git a/webrtc/rtc_base/sequenced_task_checker_unittest.cc b/webrtc/rtc_base/sequenced_task_checker_unittest.cc index 55fc4744ae..ae6e09dff7 100644 --- a/webrtc/rtc_base/sequenced_task_checker_unittest.cc +++ b/webrtc/rtc_base/sequenced_task_checker_unittest.cc @@ -8,11 +8,11 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/rtc_base/sequenced_task_checker.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/constructormagic.h" -#include "webrtc/rtc_base/platform_thread.h" -#include "webrtc/rtc_base/task_queue.h" +#include "webrtc/base/checks.h" +#include "webrtc/base/constructormagic.h" +#include "webrtc/base/platform_thread.h" +#include "webrtc/base/sequenced_task_checker.h" +#include "webrtc/base/task_queue.h" #include "webrtc/test/gtest.h" namespace rtc { diff --git a/webrtc/rtc_base/sha1.cc b/webrtc/rtc_base/sha1.cc index c12ebe0378..5816152b16 100644 --- a/webrtc/rtc_base/sha1.cc +++ b/webrtc/rtc_base/sha1.cc @@ -107,7 +107,7 @@ // Disabling SHA1HANDSOFF the buffer will be modified (end swapped). #define SHA1HANDSOFF -#include "webrtc/rtc_base/sha1.h" +#include "webrtc/base/sha1.h" #include #include diff --git a/webrtc/rtc_base/sha1digest.cc b/webrtc/rtc_base/sha1digest.cc index cf4de93cac..c090a06bb0 100644 --- a/webrtc/rtc_base/sha1digest.cc +++ b/webrtc/rtc_base/sha1digest.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/rtc_base/sha1digest.h" +#include "webrtc/base/sha1digest.h" namespace rtc { diff --git a/webrtc/rtc_base/sha1digest.h b/webrtc/rtc_base/sha1digest.h index 2f939ce5e5..bcd5514b88 100644 --- a/webrtc/rtc_base/sha1digest.h +++ b/webrtc/rtc_base/sha1digest.h @@ -11,8 +11,8 @@ #ifndef WEBRTC_RTC_BASE_SHA1DIGEST_H_ #define WEBRTC_RTC_BASE_SHA1DIGEST_H_ -#include "webrtc/rtc_base/messagedigest.h" -#include "webrtc/rtc_base/sha1.h" +#include "webrtc/base/messagedigest.h" +#include "webrtc/base/sha1.h" namespace rtc { diff --git a/webrtc/rtc_base/sha1digest_unittest.cc b/webrtc/rtc_base/sha1digest_unittest.cc index 24c30faede..d3c2043872 100644 --- a/webrtc/rtc_base/sha1digest_unittest.cc +++ b/webrtc/rtc_base/sha1digest_unittest.cc @@ -8,9 +8,9 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/rtc_base/sha1digest.h" -#include "webrtc/rtc_base/gunit.h" -#include "webrtc/rtc_base/stringencode.h" +#include "webrtc/base/sha1digest.h" +#include "webrtc/base/gunit.h" +#include "webrtc/base/stringencode.h" namespace rtc { diff --git a/webrtc/rtc_base/sigslot.cc b/webrtc/rtc_base/sigslot.cc index 3f22af1fc3..2fdb214b52 100644 --- a/webrtc/rtc_base/sigslot.cc +++ b/webrtc/rtc_base/sigslot.cc @@ -6,7 +6,7 @@ // the proviso that the author takes on no responsibility or liability for any // use. -#include "webrtc/rtc_base/sigslot.h" +#include "webrtc/base/sigslot.h" namespace sigslot { diff --git a/webrtc/rtc_base/sigslot.h b/webrtc/rtc_base/sigslot.h index ec4232cdca..2981b52840 100644 --- a/webrtc/rtc_base/sigslot.h +++ b/webrtc/rtc_base/sigslot.h @@ -113,7 +113,7 @@ #if !defined(WIN32_LEAN_AND_MEAN) #define WIN32_LEAN_AND_MEAN #endif -#include "webrtc/rtc_base/win32.h" +#include "webrtc/base/win32.h" #elif defined(__GNUG__) || defined(SIGSLOT_USE_POSIX_THREADS) #define _SIGSLOT_HAS_POSIX_THREADS #include diff --git a/webrtc/rtc_base/sigslot_unittest.cc b/webrtc/rtc_base/sigslot_unittest.cc index d538b0fa6b..6d21d84fab 100644 --- a/webrtc/rtc_base/sigslot_unittest.cc +++ b/webrtc/rtc_base/sigslot_unittest.cc @@ -8,9 +8,9 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/rtc_base/sigslot.h" +#include "webrtc/base/sigslot.h" -#include "webrtc/rtc_base/gunit.h" +#include "webrtc/base/gunit.h" // This function, when passed a has_slots or signalx, will break the build if // its threading requirement is not single threaded diff --git a/webrtc/rtc_base/sigslottester.h b/webrtc/rtc_base/sigslottester.h index ed6dadc4ae..5eeb477a77 100755 --- a/webrtc/rtc_base/sigslottester.h +++ b/webrtc/rtc_base/sigslottester.h @@ -39,8 +39,8 @@ // EXPECT_EQ("hello", capture); // /* See unit-tests for more examples */ -#include "webrtc/rtc_base/constructormagic.h" -#include "webrtc/rtc_base/sigslot.h" +#include "webrtc/base/constructormagic.h" +#include "webrtc/base/sigslot.h" namespace rtc { diff --git a/webrtc/rtc_base/sigslottester_unittest.cc b/webrtc/rtc_base/sigslottester_unittest.cc index e0861d76bc..00b2577109 100755 --- a/webrtc/rtc_base/sigslottester_unittest.cc +++ b/webrtc/rtc_base/sigslottester_unittest.cc @@ -8,12 +8,12 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/rtc_base/sigslottester.h" +#include "webrtc/base/sigslottester.h" #include -#include "webrtc/rtc_base/gunit.h" -#include "webrtc/rtc_base/sigslot.h" +#include "webrtc/base/gunit.h" +#include "webrtc/base/sigslot.h" namespace rtc { diff --git a/webrtc/rtc_base/socket.h b/webrtc/rtc_base/socket.h index 2b2161d9bf..9aed77e3b2 100644 --- a/webrtc/rtc_base/socket.h +++ b/webrtc/rtc_base/socket.h @@ -22,12 +22,12 @@ #endif #if defined(WEBRTC_WIN) -#include "webrtc/rtc_base/win32.h" +#include "webrtc/base/win32.h" #endif -#include "webrtc/rtc_base/basictypes.h" -#include "webrtc/rtc_base/constructormagic.h" -#include "webrtc/rtc_base/socketaddress.h" +#include "webrtc/base/basictypes.h" +#include "webrtc/base/constructormagic.h" +#include "webrtc/base/socketaddress.h" // Rather than converting errors into a private namespace, // Reuse the POSIX socket api errors. Note this depends on diff --git a/webrtc/rtc_base/socket_unittest.cc b/webrtc/rtc_base/socket_unittest.cc index 35bf2d1c4d..2342007129 100644 --- a/webrtc/rtc_base/socket_unittest.cc +++ b/webrtc/rtc_base/socket_unittest.cc @@ -10,18 +10,18 @@ #include -#include "webrtc/rtc_base/socket_unittest.h" +#include "webrtc/base/socket_unittest.h" -#include "webrtc/rtc_base/arraysize.h" -#include "webrtc/rtc_base/asyncudpsocket.h" -#include "webrtc/rtc_base/buffer.h" -#include "webrtc/rtc_base/gunit.h" -#include "webrtc/rtc_base/nethelpers.h" -#include "webrtc/rtc_base/ptr_util.h" -#include "webrtc/rtc_base/socketserver.h" -#include "webrtc/rtc_base/testclient.h" -#include "webrtc/rtc_base/testutils.h" -#include "webrtc/rtc_base/thread.h" +#include "webrtc/base/arraysize.h" +#include "webrtc/base/asyncudpsocket.h" +#include "webrtc/base/buffer.h" +#include "webrtc/base/gunit.h" +#include "webrtc/base/nethelpers.h" +#include "webrtc/base/ptr_util.h" +#include "webrtc/base/socketserver.h" +#include "webrtc/base/testclient.h" +#include "webrtc/base/testutils.h" +#include "webrtc/base/thread.h" namespace rtc { diff --git a/webrtc/rtc_base/socket_unittest.h b/webrtc/rtc_base/socket_unittest.h index c236339e57..a92c7fdc4e 100644 --- a/webrtc/rtc_base/socket_unittest.h +++ b/webrtc/rtc_base/socket_unittest.h @@ -11,8 +11,8 @@ #ifndef WEBRTC_RTC_BASE_SOCKET_UNITTEST_H_ #define WEBRTC_RTC_BASE_SOCKET_UNITTEST_H_ -#include "webrtc/rtc_base/gunit.h" -#include "webrtc/rtc_base/thread.h" +#include "webrtc/base/gunit.h" +#include "webrtc/base/thread.h" namespace rtc { diff --git a/webrtc/rtc_base/socketadapters.cc b/webrtc/rtc_base/socketadapters.cc index 8519b89093..060029c1c7 100644 --- a/webrtc/rtc_base/socketadapters.cc +++ b/webrtc/rtc_base/socketadapters.cc @@ -26,13 +26,13 @@ #include -#include "webrtc/rtc_base/bytebuffer.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/httpcommon.h" -#include "webrtc/rtc_base/logging.h" -#include "webrtc/rtc_base/socketadapters.h" -#include "webrtc/rtc_base/stringencode.h" -#include "webrtc/rtc_base/stringutils.h" +#include "webrtc/base/bytebuffer.h" +#include "webrtc/base/checks.h" +#include "webrtc/base/httpcommon.h" +#include "webrtc/base/logging.h" +#include "webrtc/base/socketadapters.h" +#include "webrtc/base/stringencode.h" +#include "webrtc/base/stringutils.h" namespace rtc { diff --git a/webrtc/rtc_base/socketadapters.h b/webrtc/rtc_base/socketadapters.h index 34dd19b852..a6c5c4e2dc 100644 --- a/webrtc/rtc_base/socketadapters.h +++ b/webrtc/rtc_base/socketadapters.h @@ -14,10 +14,10 @@ #include #include -#include "webrtc/rtc_base/asyncsocket.h" -#include "webrtc/rtc_base/constructormagic.h" -#include "webrtc/rtc_base/cryptstring.h" -#include "webrtc/rtc_base/logging.h" +#include "webrtc/base/asyncsocket.h" +#include "webrtc/base/constructormagic.h" +#include "webrtc/base/cryptstring.h" +#include "webrtc/base/logging.h" namespace rtc { diff --git a/webrtc/rtc_base/socketaddress.cc b/webrtc/rtc_base/socketaddress.cc index 5b26b9f74a..d931f72b21 100644 --- a/webrtc/rtc_base/socketaddress.cc +++ b/webrtc/rtc_base/socketaddress.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/rtc_base/socketaddress.h" +#include "webrtc/base/socketaddress.h" #if defined(WEBRTC_POSIX) #include @@ -27,13 +27,13 @@ #include -#include "webrtc/rtc_base/byteorder.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/logging.h" -#include "webrtc/rtc_base/nethelpers.h" +#include "webrtc/base/byteorder.h" +#include "webrtc/base/checks.h" +#include "webrtc/base/logging.h" +#include "webrtc/base/nethelpers.h" #if defined(WEBRTC_WIN) -#include "webrtc/rtc_base/win32.h" +#include "webrtc/base/win32.h" #endif namespace rtc { diff --git a/webrtc/rtc_base/socketaddress.h b/webrtc/rtc_base/socketaddress.h index 617e35534f..dd64ae9a88 100644 --- a/webrtc/rtc_base/socketaddress.h +++ b/webrtc/rtc_base/socketaddress.h @@ -11,11 +11,11 @@ #ifndef WEBRTC_RTC_BASE_SOCKETADDRESS_H_ #define WEBRTC_RTC_BASE_SOCKETADDRESS_H_ -#include #include #include -#include "webrtc/rtc_base/basictypes.h" -#include "webrtc/rtc_base/ipaddress.h" +#include +#include "webrtc/base/basictypes.h" +#include "webrtc/base/ipaddress.h" #undef SetPort diff --git a/webrtc/rtc_base/socketaddress_unittest.cc b/webrtc/rtc_base/socketaddress_unittest.cc index 19fbc50313..072918e88c 100644 --- a/webrtc/rtc_base/socketaddress_unittest.cc +++ b/webrtc/rtc_base/socketaddress_unittest.cc @@ -12,9 +12,9 @@ #include // for sockaddr_in #endif -#include "webrtc/rtc_base/gunit.h" -#include "webrtc/rtc_base/ipaddress.h" -#include "webrtc/rtc_base/socketaddress.h" +#include "webrtc/base/gunit.h" +#include "webrtc/base/socketaddress.h" +#include "webrtc/base/ipaddress.h" namespace rtc { diff --git a/webrtc/rtc_base/socketaddresspair.cc b/webrtc/rtc_base/socketaddresspair.cc index 2be718fdcf..dfa8b25a04 100644 --- a/webrtc/rtc_base/socketaddresspair.cc +++ b/webrtc/rtc_base/socketaddresspair.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/rtc_base/socketaddresspair.h" +#include "webrtc/base/socketaddresspair.h" namespace rtc { diff --git a/webrtc/rtc_base/socketaddresspair.h b/webrtc/rtc_base/socketaddresspair.h index cec84a7ac9..91137a335f 100644 --- a/webrtc/rtc_base/socketaddresspair.h +++ b/webrtc/rtc_base/socketaddresspair.h @@ -11,7 +11,7 @@ #ifndef WEBRTC_RTC_BASE_SOCKETADDRESSPAIR_H_ #define WEBRTC_RTC_BASE_SOCKETADDRESSPAIR_H_ -#include "webrtc/rtc_base/socketaddress.h" +#include "webrtc/base/socketaddress.h" namespace rtc { diff --git a/webrtc/rtc_base/socketfactory.h b/webrtc/rtc_base/socketfactory.h index 749eb1771d..128026437a 100644 --- a/webrtc/rtc_base/socketfactory.h +++ b/webrtc/rtc_base/socketfactory.h @@ -11,8 +11,8 @@ #ifndef WEBRTC_RTC_BASE_SOCKETFACTORY_H_ #define WEBRTC_RTC_BASE_SOCKETFACTORY_H_ -#include "webrtc/rtc_base/asyncsocket.h" -#include "webrtc/rtc_base/socket.h" +#include "webrtc/base/socket.h" +#include "webrtc/base/asyncsocket.h" namespace rtc { diff --git a/webrtc/rtc_base/socketserver.h b/webrtc/rtc_base/socketserver.h index dc99c2bf50..6d06f2fca7 100644 --- a/webrtc/rtc_base/socketserver.h +++ b/webrtc/rtc_base/socketserver.h @@ -12,7 +12,7 @@ #define WEBRTC_RTC_BASE_SOCKETSERVER_H_ #include -#include "webrtc/rtc_base/socketfactory.h" +#include "webrtc/base/socketfactory.h" namespace rtc { diff --git a/webrtc/rtc_base/socketstream.cc b/webrtc/rtc_base/socketstream.cc index 2c09fcf134..a218dd803a 100644 --- a/webrtc/rtc_base/socketstream.cc +++ b/webrtc/rtc_base/socketstream.cc @@ -8,9 +8,9 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/rtc_base/socketstream.h" +#include "webrtc/base/socketstream.h" -#include "webrtc/rtc_base/checks.h" +#include "webrtc/base/checks.h" namespace rtc { diff --git a/webrtc/rtc_base/socketstream.h b/webrtc/rtc_base/socketstream.h index e78c876774..7991c61ccf 100644 --- a/webrtc/rtc_base/socketstream.h +++ b/webrtc/rtc_base/socketstream.h @@ -11,9 +11,9 @@ #ifndef WEBRTC_RTC_BASE_SOCKETSTREAM_H_ #define WEBRTC_RTC_BASE_SOCKETSTREAM_H_ -#include "webrtc/rtc_base/asyncsocket.h" -#include "webrtc/rtc_base/constructormagic.h" -#include "webrtc/rtc_base/stream.h" +#include "webrtc/base/asyncsocket.h" +#include "webrtc/base/constructormagic.h" +#include "webrtc/base/stream.h" namespace rtc { diff --git a/webrtc/rtc_base/ssladapter.cc b/webrtc/rtc_base/ssladapter.cc index 07a13b5b23..06fce54902 100644 --- a/webrtc/rtc_base/ssladapter.cc +++ b/webrtc/rtc_base/ssladapter.cc @@ -8,9 +8,9 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/rtc_base/ssladapter.h" +#include "webrtc/base/ssladapter.h" -#include "webrtc/rtc_base/openssladapter.h" +#include "webrtc/base/openssladapter.h" /////////////////////////////////////////////////////////////////////////////// diff --git a/webrtc/rtc_base/ssladapter.h b/webrtc/rtc_base/ssladapter.h index dccb6d186d..7e03c4f8af 100644 --- a/webrtc/rtc_base/ssladapter.h +++ b/webrtc/rtc_base/ssladapter.h @@ -11,8 +11,8 @@ #ifndef WEBRTC_RTC_BASE_SSLADAPTER_H_ #define WEBRTC_RTC_BASE_SSLADAPTER_H_ -#include "webrtc/rtc_base/asyncsocket.h" -#include "webrtc/rtc_base/sslstreamadapter.h" +#include "webrtc/base/asyncsocket.h" +#include "webrtc/base/sslstreamadapter.h" namespace rtc { diff --git a/webrtc/rtc_base/ssladapter_unittest.cc b/webrtc/rtc_base/ssladapter_unittest.cc index 929b14f87b..0eaac17885 100644 --- a/webrtc/rtc_base/ssladapter_unittest.cc +++ b/webrtc/rtc_base/ssladapter_unittest.cc @@ -11,15 +11,15 @@ #include #include -#include "webrtc/rtc_base/gunit.h" -#include "webrtc/rtc_base/ipaddress.h" -#include "webrtc/rtc_base/socketstream.h" -#include "webrtc/rtc_base/ssladapter.h" -#include "webrtc/rtc_base/sslidentity.h" -#include "webrtc/rtc_base/sslstreamadapter.h" -#include "webrtc/rtc_base/stream.h" -#include "webrtc/rtc_base/stringencode.h" -#include "webrtc/rtc_base/virtualsocketserver.h" +#include "webrtc/base/gunit.h" +#include "webrtc/base/ipaddress.h" +#include "webrtc/base/socketstream.h" +#include "webrtc/base/ssladapter.h" +#include "webrtc/base/sslidentity.h" +#include "webrtc/base/sslstreamadapter.h" +#include "webrtc/base/stream.h" +#include "webrtc/base/stringencode.h" +#include "webrtc/base/virtualsocketserver.h" static const int kTimeout = 5000; diff --git a/webrtc/rtc_base/sslfingerprint.cc b/webrtc/rtc_base/sslfingerprint.cc index adf38518a5..bd15743a8e 100644 --- a/webrtc/rtc_base/sslfingerprint.cc +++ b/webrtc/rtc_base/sslfingerprint.cc @@ -8,15 +8,15 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/rtc_base/sslfingerprint.h" +#include "webrtc/base/sslfingerprint.h" #include #include -#include "webrtc/rtc_base/helpers.h" -#include "webrtc/rtc_base/logging.h" -#include "webrtc/rtc_base/messagedigest.h" -#include "webrtc/rtc_base/stringencode.h" +#include "webrtc/base/helpers.h" +#include "webrtc/base/logging.h" +#include "webrtc/base/messagedigest.h" +#include "webrtc/base/stringencode.h" namespace rtc { diff --git a/webrtc/rtc_base/sslfingerprint.h b/webrtc/rtc_base/sslfingerprint.h index 557ac56c67..4effca6afb 100644 --- a/webrtc/rtc_base/sslfingerprint.h +++ b/webrtc/rtc_base/sslfingerprint.h @@ -13,10 +13,10 @@ #include -#include "webrtc/rtc_base/basictypes.h" -#include "webrtc/rtc_base/copyonwritebuffer.h" -#include "webrtc/rtc_base/rtccertificate.h" -#include "webrtc/rtc_base/sslidentity.h" +#include "webrtc/base/basictypes.h" +#include "webrtc/base/copyonwritebuffer.h" +#include "webrtc/base/rtccertificate.h" +#include "webrtc/base/sslidentity.h" namespace rtc { diff --git a/webrtc/rtc_base/sslidentity.cc b/webrtc/rtc_base/sslidentity.cc index 38c27cac9e..a5dd7b9ce6 100644 --- a/webrtc/rtc_base/sslidentity.cc +++ b/webrtc/rtc_base/sslidentity.cc @@ -9,16 +9,16 @@ */ // Handling of certificates and keypairs for SSLStreamAdapter's peer mode. -#include "webrtc/rtc_base/sslidentity.h" +#include "webrtc/base/sslidentity.h" #include #include -#include "webrtc/rtc_base/base64.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/logging.h" -#include "webrtc/rtc_base/opensslidentity.h" -#include "webrtc/rtc_base/sslfingerprint.h" +#include "webrtc/base/base64.h" +#include "webrtc/base/checks.h" +#include "webrtc/base/logging.h" +#include "webrtc/base/opensslidentity.h" +#include "webrtc/base/sslfingerprint.h" namespace rtc { diff --git a/webrtc/rtc_base/sslidentity.h b/webrtc/rtc_base/sslidentity.h index e6ac527e77..f84f725ca7 100644 --- a/webrtc/rtc_base/sslidentity.h +++ b/webrtc/rtc_base/sslidentity.h @@ -18,10 +18,10 @@ #include #include -#include "webrtc/rtc_base/buffer.h" -#include "webrtc/rtc_base/constructormagic.h" -#include "webrtc/rtc_base/messagedigest.h" -#include "webrtc/rtc_base/timeutils.h" +#include "webrtc/base/buffer.h" +#include "webrtc/base/constructormagic.h" +#include "webrtc/base/messagedigest.h" +#include "webrtc/base/timeutils.h" namespace rtc { diff --git a/webrtc/rtc_base/sslidentity_unittest.cc b/webrtc/rtc_base/sslidentity_unittest.cc index 9b90b4cad5..5c881c2371 100644 --- a/webrtc/rtc_base/sslidentity_unittest.cc +++ b/webrtc/rtc_base/sslidentity_unittest.cc @@ -11,13 +11,13 @@ #include #include -#include "webrtc/rtc_base/fakesslidentity.h" -#include "webrtc/rtc_base/gunit.h" -#include "webrtc/rtc_base/helpers.h" -#include "webrtc/rtc_base/ssladapter.h" -#include "webrtc/rtc_base/sslfingerprint.h" -#include "webrtc/rtc_base/sslidentity.h" -#include "webrtc/rtc_base/stringutils.h" +#include "webrtc/base/fakesslidentity.h" +#include "webrtc/base/gunit.h" +#include "webrtc/base/helpers.h" +#include "webrtc/base/ssladapter.h" +#include "webrtc/base/sslfingerprint.h" +#include "webrtc/base/sslidentity.h" +#include "webrtc/base/stringutils.h" using rtc::SSLIdentity; diff --git a/webrtc/rtc_base/sslstreamadapter.cc b/webrtc/rtc_base/sslstreamadapter.cc index d55b6fea2a..0927704cd4 100644 --- a/webrtc/rtc_base/sslstreamadapter.cc +++ b/webrtc/rtc_base/sslstreamadapter.cc @@ -8,9 +8,9 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/rtc_base/sslstreamadapter.h" +#include "webrtc/base/sslstreamadapter.h" -#include "webrtc/rtc_base/opensslstreamadapter.h" +#include "webrtc/base/opensslstreamadapter.h" /////////////////////////////////////////////////////////////////////////////// diff --git a/webrtc/rtc_base/sslstreamadapter.h b/webrtc/rtc_base/sslstreamadapter.h index 7fb086714e..889b6349b9 100644 --- a/webrtc/rtc_base/sslstreamadapter.h +++ b/webrtc/rtc_base/sslstreamadapter.h @@ -15,8 +15,8 @@ #include #include -#include "webrtc/rtc_base/sslidentity.h" -#include "webrtc/rtc_base/stream.h" +#include "webrtc/base/stream.h" +#include "webrtc/base/sslidentity.h" namespace rtc { diff --git a/webrtc/rtc_base/sslstreamadapter_unittest.cc b/webrtc/rtc_base/sslstreamadapter_unittest.cc index a2d63e8060..b5184e6d44 100644 --- a/webrtc/rtc_base/sslstreamadapter_unittest.cc +++ b/webrtc/rtc_base/sslstreamadapter_unittest.cc @@ -14,14 +14,14 @@ #include #include -#include "webrtc/rtc_base/bufferqueue.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/gunit.h" -#include "webrtc/rtc_base/helpers.h" -#include "webrtc/rtc_base/ssladapter.h" -#include "webrtc/rtc_base/sslidentity.h" -#include "webrtc/rtc_base/sslstreamadapter.h" -#include "webrtc/rtc_base/stream.h" +#include "webrtc/base/bufferqueue.h" +#include "webrtc/base/checks.h" +#include "webrtc/base/gunit.h" +#include "webrtc/base/helpers.h" +#include "webrtc/base/ssladapter.h" +#include "webrtc/base/sslidentity.h" +#include "webrtc/base/sslstreamadapter.h" +#include "webrtc/base/stream.h" using ::testing::WithParamInterface; using ::testing::Values; diff --git a/webrtc/rtc_base/stream.cc b/webrtc/rtc_base/stream.cc index df2d66558b..67ef104044 100644 --- a/webrtc/rtc_base/stream.cc +++ b/webrtc/rtc_base/stream.cc @@ -18,18 +18,18 @@ #include #include -#include "webrtc/rtc_base/basictypes.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/logging.h" -#include "webrtc/rtc_base/messagequeue.h" -#include "webrtc/rtc_base/stream.h" -#include "webrtc/rtc_base/stringencode.h" -#include "webrtc/rtc_base/stringutils.h" -#include "webrtc/rtc_base/thread.h" -#include "webrtc/rtc_base/timeutils.h" +#include "webrtc/base/basictypes.h" +#include "webrtc/base/checks.h" +#include "webrtc/base/logging.h" +#include "webrtc/base/messagequeue.h" +#include "webrtc/base/stream.h" +#include "webrtc/base/stringencode.h" +#include "webrtc/base/stringutils.h" +#include "webrtc/base/thread.h" +#include "webrtc/base/timeutils.h" #if defined(WEBRTC_WIN) -#include "webrtc/rtc_base/win32.h" +#include "webrtc/base/win32.h" #define fileno _fileno #endif diff --git a/webrtc/rtc_base/stream.h b/webrtc/rtc_base/stream.h index 601ef66a4d..c03867da31 100644 --- a/webrtc/rtc_base/stream.h +++ b/webrtc/rtc_base/stream.h @@ -15,13 +15,13 @@ #include -#include "webrtc/rtc_base/buffer.h" -#include "webrtc/rtc_base/constructormagic.h" -#include "webrtc/rtc_base/criticalsection.h" -#include "webrtc/rtc_base/logging.h" -#include "webrtc/rtc_base/messagehandler.h" -#include "webrtc/rtc_base/messagequeue.h" -#include "webrtc/rtc_base/sigslot.h" +#include "webrtc/base/buffer.h" +#include "webrtc/base/constructormagic.h" +#include "webrtc/base/criticalsection.h" +#include "webrtc/base/logging.h" +#include "webrtc/base/messagehandler.h" +#include "webrtc/base/messagequeue.h" +#include "webrtc/base/sigslot.h" namespace rtc { diff --git a/webrtc/rtc_base/stream_unittest.cc b/webrtc/rtc_base/stream_unittest.cc index 0f8fbf1bcb..0fbb6ab835 100644 --- a/webrtc/rtc_base/stream_unittest.cc +++ b/webrtc/rtc_base/stream_unittest.cc @@ -8,10 +8,10 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/rtc_base/stream.h" -#include "webrtc/rtc_base/fileutils.h" -#include "webrtc/rtc_base/gunit.h" -#include "webrtc/rtc_base/pathutils.h" +#include "webrtc/base/fileutils.h" +#include "webrtc/base/gunit.h" +#include "webrtc/base/pathutils.h" +#include "webrtc/base/stream.h" namespace rtc { diff --git a/webrtc/rtc_base/string_to_number.cc b/webrtc/rtc_base/string_to_number.cc index 06107f5087..b8e969daa4 100644 --- a/webrtc/rtc_base/string_to_number.cc +++ b/webrtc/rtc_base/string_to_number.cc @@ -11,7 +11,7 @@ #include #include -#include "webrtc/rtc_base/string_to_number.h" +#include "webrtc/base/string_to_number.h" namespace rtc { namespace string_to_number_internal { diff --git a/webrtc/rtc_base/string_to_number.h b/webrtc/rtc_base/string_to_number.h index c61d1ed73c..4dcddf56fd 100644 --- a/webrtc/rtc_base/string_to_number.h +++ b/webrtc/rtc_base/string_to_number.h @@ -14,7 +14,7 @@ #include #include -#include "webrtc/rtc_base/optional.h" +#include "webrtc/base/optional.h" namespace rtc { diff --git a/webrtc/rtc_base/string_to_number_unittest.cc b/webrtc/rtc_base/string_to_number_unittest.cc index 2c1aeceaac..00ebd4cae4 100644 --- a/webrtc/rtc_base/string_to_number_unittest.cc +++ b/webrtc/rtc_base/string_to_number_unittest.cc @@ -8,13 +8,13 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/rtc_base/string_to_number.h" +#include "webrtc/base/string_to_number.h" #include #include #include -#include "webrtc/rtc_base/gunit.h" +#include "webrtc/base/gunit.h" namespace rtc { diff --git a/webrtc/rtc_base/stringencode.cc b/webrtc/rtc_base/stringencode.cc index 93470b6d36..c7d206fd93 100644 --- a/webrtc/rtc_base/stringencode.cc +++ b/webrtc/rtc_base/stringencode.cc @@ -8,13 +8,13 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/rtc_base/stringencode.h" +#include "webrtc/base/stringencode.h" #include #include -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/stringutils.h" +#include "webrtc/base/checks.h" +#include "webrtc/base/stringutils.h" namespace rtc { diff --git a/webrtc/rtc_base/stringencode.h b/webrtc/rtc_base/stringencode.h index 5296a9cbb0..668947daff 100644 --- a/webrtc/rtc_base/stringencode.h +++ b/webrtc/rtc_base/stringencode.h @@ -15,7 +15,7 @@ #include #include -#include "webrtc/rtc_base/checks.h" +#include "webrtc/base/checks.h" namespace rtc { diff --git a/webrtc/rtc_base/stringencode_unittest.cc b/webrtc/rtc_base/stringencode_unittest.cc index 36071edd85..60929f3aed 100644 --- a/webrtc/rtc_base/stringencode_unittest.cc +++ b/webrtc/rtc_base/stringencode_unittest.cc @@ -8,10 +8,10 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/rtc_base/stringencode.h" -#include "webrtc/rtc_base/arraysize.h" -#include "webrtc/rtc_base/gunit.h" -#include "webrtc/rtc_base/stringutils.h" +#include "webrtc/base/arraysize.h" +#include "webrtc/base/gunit.h" +#include "webrtc/base/stringencode.h" +#include "webrtc/base/stringutils.h" namespace rtc { diff --git a/webrtc/rtc_base/stringize_macros_unittest.cc b/webrtc/rtc_base/stringize_macros_unittest.cc index bb3a0f6a9b..d0ba113d4d 100644 --- a/webrtc/rtc_base/stringize_macros_unittest.cc +++ b/webrtc/rtc_base/stringize_macros_unittest.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/rtc_base/stringize_macros.h" +#include "webrtc/base/stringize_macros.h" #include "webrtc/test/gtest.h" diff --git a/webrtc/rtc_base/stringutils.cc b/webrtc/rtc_base/stringutils.cc index b47bb16987..eca1362163 100644 --- a/webrtc/rtc_base/stringutils.cc +++ b/webrtc/rtc_base/stringutils.cc @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/rtc_base/stringutils.h" -#include "webrtc/rtc_base/checks.h" +#include "webrtc/base/checks.h" +#include "webrtc/base/stringutils.h" namespace rtc { diff --git a/webrtc/rtc_base/stringutils_unittest.cc b/webrtc/rtc_base/stringutils_unittest.cc index 7689b838df..7d5b8e24c9 100644 --- a/webrtc/rtc_base/stringutils_unittest.cc +++ b/webrtc/rtc_base/stringutils_unittest.cc @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/rtc_base/stringutils.h" -#include "webrtc/rtc_base/gunit.h" +#include "webrtc/base/gunit.h" +#include "webrtc/base/stringutils.h" namespace rtc { diff --git a/webrtc/rtc_base/swap_queue.h b/webrtc/rtc_base/swap_queue.h index 3519686af9..8c6527894c 100644 --- a/webrtc/rtc_base/swap_queue.h +++ b/webrtc/rtc_base/swap_queue.h @@ -15,9 +15,9 @@ #include #include -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/constructormagic.h" -#include "webrtc/rtc_base/criticalsection.h" +#include "webrtc/base/checks.h" +#include "webrtc/base/constructormagic.h" +#include "webrtc/base/criticalsection.h" namespace webrtc { diff --git a/webrtc/rtc_base/swap_queue_unittest.cc b/webrtc/rtc_base/swap_queue_unittest.cc index ceda7eb353..ff00626cbc 100644 --- a/webrtc/rtc_base/swap_queue_unittest.cc +++ b/webrtc/rtc_base/swap_queue_unittest.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/rtc_base/swap_queue.h" +#include "webrtc/base/swap_queue.h" #include diff --git a/webrtc/rtc_base/task_queue.h b/webrtc/rtc_base/task_queue.h index 218fce9a3b..4c43b23164 100644 --- a/webrtc/rtc_base/task_queue.h +++ b/webrtc/rtc_base/task_queue.h @@ -19,16 +19,16 @@ #include #endif -#include "webrtc/rtc_base/constructormagic.h" -#include "webrtc/rtc_base/criticalsection.h" +#include "webrtc/base/constructormagic.h" +#include "webrtc/base/criticalsection.h" #if defined(WEBRTC_WIN) || defined(WEBRTC_BUILD_LIBEVENT) -#include "webrtc/rtc_base/platform_thread.h" +#include "webrtc/base/platform_thread.h" #endif #if defined(WEBRTC_BUILD_LIBEVENT) -#include "webrtc/rtc_base/refcountedobject.h" -#include "webrtc/rtc_base/scoped_ref_ptr.h" +#include "webrtc/base/refcountedobject.h" +#include "webrtc/base/scoped_ref_ptr.h" struct event_base; struct event; diff --git a/webrtc/rtc_base/task_queue_gcd.cc b/webrtc/rtc_base/task_queue_gcd.cc index 45c5f09ebf..296da16fdb 100644 --- a/webrtc/rtc_base/task_queue_gcd.cc +++ b/webrtc/rtc_base/task_queue_gcd.cc @@ -12,13 +12,13 @@ // The implementation uses Grand Central Dispatch queues (GCD) to // do the actual task queuing. -#include "webrtc/rtc_base/task_queue.h" +#include "webrtc/base/task_queue.h" #include -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/logging.h" -#include "webrtc/rtc_base/task_queue_posix.h" +#include "webrtc/base/checks.h" +#include "webrtc/base/logging.h" +#include "webrtc/base/task_queue_posix.h" namespace rtc { namespace { diff --git a/webrtc/rtc_base/task_queue_libevent.cc b/webrtc/rtc_base/task_queue_libevent.cc index b1070da7b7..1376ea3f70 100644 --- a/webrtc/rtc_base/task_queue_libevent.cc +++ b/webrtc/rtc_base/task_queue_libevent.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/rtc_base/task_queue.h" +#include "webrtc/base/task_queue.h" #include #include @@ -16,10 +16,10 @@ #include #include "base/third_party/libevent/event.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/logging.h" -#include "webrtc/rtc_base/task_queue_posix.h" -#include "webrtc/rtc_base/timeutils.h" +#include "webrtc/base/checks.h" +#include "webrtc/base/logging.h" +#include "webrtc/base/task_queue_posix.h" +#include "webrtc/base/timeutils.h" namespace rtc { using internal::GetQueuePtrTls; diff --git a/webrtc/rtc_base/task_queue_posix.cc b/webrtc/rtc_base/task_queue_posix.cc index 89956f1f90..3b00ac8e12 100644 --- a/webrtc/rtc_base/task_queue_posix.cc +++ b/webrtc/rtc_base/task_queue_posix.cc @@ -8,10 +8,10 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/rtc_base/task_queue_posix.h" +#include "webrtc/base/task_queue_posix.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/task_queue.h" +#include "webrtc/base/checks.h" +#include "webrtc/base/task_queue.h" namespace rtc { namespace internal { diff --git a/webrtc/rtc_base/task_queue_unittest.cc b/webrtc/rtc_base/task_queue_unittest.cc index fbaf6d5ec1..856249da32 100644 --- a/webrtc/rtc_base/task_queue_unittest.cc +++ b/webrtc/rtc_base/task_queue_unittest.cc @@ -18,11 +18,11 @@ #include #include -#include "webrtc/rtc_base/bind.h" -#include "webrtc/rtc_base/event.h" -#include "webrtc/rtc_base/gunit.h" -#include "webrtc/rtc_base/task_queue.h" -#include "webrtc/rtc_base/timeutils.h" +#include "webrtc/base/bind.h" +#include "webrtc/base/event.h" +#include "webrtc/base/gunit.h" +#include "webrtc/base/task_queue.h" +#include "webrtc/base/timeutils.h" namespace rtc { namespace { diff --git a/webrtc/rtc_base/task_queue_win.cc b/webrtc/rtc_base/task_queue_win.cc index 128a98f858..a149dd88a6 100644 --- a/webrtc/rtc_base/task_queue_win.cc +++ b/webrtc/rtc_base/task_queue_win.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/rtc_base/task_queue.h" +#include "webrtc/base/task_queue.h" #include #include @@ -16,11 +16,11 @@ #include #include -#include "webrtc/rtc_base/arraysize.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/logging.h" -#include "webrtc/rtc_base/safe_conversions.h" -#include "webrtc/rtc_base/timeutils.h" +#include "webrtc/base/arraysize.h" +#include "webrtc/base/checks.h" +#include "webrtc/base/logging.h" +#include "webrtc/base/safe_conversions.h" +#include "webrtc/base/timeutils.h" namespace rtc { namespace { diff --git a/webrtc/rtc_base/testclient.cc b/webrtc/rtc_base/testclient.cc index a54122cc5a..b6fd692350 100644 --- a/webrtc/rtc_base/testclient.cc +++ b/webrtc/rtc_base/testclient.cc @@ -8,12 +8,12 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/rtc_base/testclient.h" +#include "webrtc/base/testclient.h" -#include "webrtc/rtc_base/gunit.h" -#include "webrtc/rtc_base/ptr_util.h" -#include "webrtc/rtc_base/thread.h" -#include "webrtc/rtc_base/timeutils.h" +#include "webrtc/base/gunit.h" +#include "webrtc/base/ptr_util.h" +#include "webrtc/base/thread.h" +#include "webrtc/base/timeutils.h" namespace rtc { diff --git a/webrtc/rtc_base/testclient.h b/webrtc/rtc_base/testclient.h index 18fe71afec..b15657b5de 100644 --- a/webrtc/rtc_base/testclient.h +++ b/webrtc/rtc_base/testclient.h @@ -13,10 +13,10 @@ #include #include -#include "webrtc/rtc_base/asyncudpsocket.h" -#include "webrtc/rtc_base/constructormagic.h" -#include "webrtc/rtc_base/criticalsection.h" -#include "webrtc/rtc_base/fakeclock.h" +#include "webrtc/base/asyncudpsocket.h" +#include "webrtc/base/constructormagic.h" +#include "webrtc/base/criticalsection.h" +#include "webrtc/base/fakeclock.h" namespace rtc { diff --git a/webrtc/rtc_base/testclient_unittest.cc b/webrtc/rtc_base/testclient_unittest.cc index 2607dbb3ec..8392abfa94 100644 --- a/webrtc/rtc_base/testclient_unittest.cc +++ b/webrtc/rtc_base/testclient_unittest.cc @@ -8,13 +8,13 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/rtc_base/testclient.h" -#include "webrtc/rtc_base/gunit.h" -#include "webrtc/rtc_base/nethelpers.h" -#include "webrtc/rtc_base/physicalsocketserver.h" -#include "webrtc/rtc_base/ptr_util.h" -#include "webrtc/rtc_base/testechoserver.h" -#include "webrtc/rtc_base/thread.h" +#include "webrtc/base/testclient.h" +#include "webrtc/base/gunit.h" +#include "webrtc/base/nethelpers.h" +#include "webrtc/base/physicalsocketserver.h" +#include "webrtc/base/ptr_util.h" +#include "webrtc/base/testechoserver.h" +#include "webrtc/base/thread.h" using namespace rtc; diff --git a/webrtc/rtc_base/testechoserver.h b/webrtc/rtc_base/testechoserver.h index e11533293f..2ec46aa003 100644 --- a/webrtc/rtc_base/testechoserver.h +++ b/webrtc/rtc_base/testechoserver.h @@ -13,11 +13,11 @@ #include #include -#include "webrtc/rtc_base/asynctcpsocket.h" -#include "webrtc/rtc_base/constructormagic.h" -#include "webrtc/rtc_base/sigslot.h" -#include "webrtc/rtc_base/socketaddress.h" -#include "webrtc/rtc_base/thread.h" +#include "webrtc/base/asynctcpsocket.h" +#include "webrtc/base/constructormagic.h" +#include "webrtc/base/socketaddress.h" +#include "webrtc/base/sigslot.h" +#include "webrtc/base/thread.h" namespace rtc { diff --git a/webrtc/rtc_base/testutils.h b/webrtc/rtc_base/testutils.h index 615f094e60..e66c072e01 100644 --- a/webrtc/rtc_base/testutils.h +++ b/webrtc/rtc_base/testutils.h @@ -26,16 +26,16 @@ #include #include #include -#include "webrtc/rtc_base/arraysize.h" -#include "webrtc/rtc_base/asyncsocket.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/gunit.h" -#include "webrtc/rtc_base/nethelpers.h" -#include "webrtc/rtc_base/pathutils.h" -#include "webrtc/rtc_base/stream.h" -#include "webrtc/rtc_base/stringencode.h" -#include "webrtc/rtc_base/stringutils.h" -#include "webrtc/rtc_base/thread.h" +#include "webrtc/base/arraysize.h" +#include "webrtc/base/asyncsocket.h" +#include "webrtc/base/checks.h" +#include "webrtc/base/gunit.h" +#include "webrtc/base/nethelpers.h" +#include "webrtc/base/pathutils.h" +#include "webrtc/base/stream.h" +#include "webrtc/base/stringencode.h" +#include "webrtc/base/stringutils.h" +#include "webrtc/base/thread.h" namespace webrtc { namespace testing { diff --git a/webrtc/rtc_base/thread.cc b/webrtc/rtc_base/thread.cc index 56a145c7d9..9174cd1bd6 100644 --- a/webrtc/rtc_base/thread.cc +++ b/webrtc/rtc_base/thread.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/rtc_base/thread.h" +#include "webrtc/base/thread.h" #if defined(WEBRTC_WIN) #include @@ -16,13 +16,13 @@ #include #endif -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/logging.h" -#include "webrtc/rtc_base/nullsocketserver.h" -#include "webrtc/rtc_base/platform_thread.h" -#include "webrtc/rtc_base/stringutils.h" -#include "webrtc/rtc_base/timeutils.h" -#include "webrtc/rtc_base/trace_event.h" +#include "webrtc/base/checks.h" +#include "webrtc/base/logging.h" +#include "webrtc/base/nullsocketserver.h" +#include "webrtc/base/platform_thread.h" +#include "webrtc/base/stringutils.h" +#include "webrtc/base/timeutils.h" +#include "webrtc/base/trace_event.h" namespace rtc { @@ -469,7 +469,7 @@ void Thread::Clear(MessageHandler* phandler, #if !defined(WEBRTC_MAC) // Note that these methods have a separate implementation for mac and ios -// defined in webrtc/rtc_base/thread_darwin.mm. +// defined in webrtc/base/thread_darwin.mm. bool Thread::ProcessMessages(int cmsLoop) { // Using ProcessMessages with a custom clock for testing and a time greater // than 0 doesn't work, since it's not guaranteed to advance the custom diff --git a/webrtc/rtc_base/thread.h b/webrtc/rtc_base/thread.h index 35b28eac53..b6e98faa16 100644 --- a/webrtc/rtc_base/thread.h +++ b/webrtc/rtc_base/thread.h @@ -20,13 +20,13 @@ #if defined(WEBRTC_POSIX) #include #endif -#include "webrtc/rtc_base/constructormagic.h" -#include "webrtc/rtc_base/event.h" -#include "webrtc/rtc_base/messagequeue.h" -#include "webrtc/rtc_base/platform_thread_types.h" +#include "webrtc/base/constructormagic.h" +#include "webrtc/base/event.h" +#include "webrtc/base/messagequeue.h" +#include "webrtc/base/platform_thread_types.h" #if defined(WEBRTC_WIN) -#include "webrtc/rtc_base/win32.h" +#include "webrtc/base/win32.h" #endif namespace rtc { diff --git a/webrtc/rtc_base/thread_annotations_unittest.cc b/webrtc/rtc_base/thread_annotations_unittest.cc index a8ff014eed..69938eff86 100644 --- a/webrtc/rtc_base/thread_annotations_unittest.cc +++ b/webrtc/rtc_base/thread_annotations_unittest.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/rtc_base/thread_annotations.h" +#include "webrtc/base/thread_annotations.h" #include "webrtc/test/gtest.h" namespace { diff --git a/webrtc/rtc_base/thread_checker.h b/webrtc/rtc_base/thread_checker.h index b6ce017538..4ab538f44b 100644 --- a/webrtc/rtc_base/thread_checker.h +++ b/webrtc/rtc_base/thread_checker.h @@ -19,10 +19,10 @@ // debug bots. #define ENABLE_THREAD_CHECKER RTC_DCHECK_IS_ON -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/constructormagic.h" -#include "webrtc/rtc_base/thread_annotations.h" -#include "webrtc/rtc_base/thread_checker_impl.h" +#include "webrtc/base/checks.h" +#include "webrtc/base/constructormagic.h" +#include "webrtc/base/thread_annotations.h" +#include "webrtc/base/thread_checker_impl.h" namespace rtc { diff --git a/webrtc/rtc_base/thread_checker_impl.cc b/webrtc/rtc_base/thread_checker_impl.cc index 307d6f8d19..79be606445 100644 --- a/webrtc/rtc_base/thread_checker_impl.cc +++ b/webrtc/rtc_base/thread_checker_impl.cc @@ -10,9 +10,9 @@ // Borrowed from Chromium's src/base/threading/thread_checker_impl.cc. -#include "webrtc/rtc_base/thread_checker_impl.h" +#include "webrtc/base/thread_checker_impl.h" -#include "webrtc/rtc_base/platform_thread.h" +#include "webrtc/base/platform_thread.h" namespace rtc { diff --git a/webrtc/rtc_base/thread_checker_impl.h b/webrtc/rtc_base/thread_checker_impl.h index 628e9b3f3e..05b1b6251d 100644 --- a/webrtc/rtc_base/thread_checker_impl.h +++ b/webrtc/rtc_base/thread_checker_impl.h @@ -13,8 +13,8 @@ #ifndef WEBRTC_RTC_BASE_THREAD_CHECKER_IMPL_H_ #define WEBRTC_RTC_BASE_THREAD_CHECKER_IMPL_H_ -#include "webrtc/rtc_base/criticalsection.h" -#include "webrtc/rtc_base/platform_thread_types.h" +#include "webrtc/base/criticalsection.h" +#include "webrtc/base/platform_thread_types.h" namespace rtc { diff --git a/webrtc/rtc_base/thread_checker_unittest.cc b/webrtc/rtc_base/thread_checker_unittest.cc index 42e1fcc2d4..e995b507e9 100644 --- a/webrtc/rtc_base/thread_checker_unittest.cc +++ b/webrtc/rtc_base/thread_checker_unittest.cc @@ -12,11 +12,11 @@ #include -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/constructormagic.h" -#include "webrtc/rtc_base/task_queue.h" -#include "webrtc/rtc_base/thread.h" -#include "webrtc/rtc_base/thread_checker.h" +#include "webrtc/base/checks.h" +#include "webrtc/base/constructormagic.h" +#include "webrtc/base/task_queue.h" +#include "webrtc/base/thread.h" +#include "webrtc/base/thread_checker.h" #include "webrtc/test/gtest.h" // Duplicated from base/threading/thread_checker.h so that we can be diff --git a/webrtc/rtc_base/thread_unittest.cc b/webrtc/rtc_base/thread_unittest.cc index db7d038172..c143120fbc 100644 --- a/webrtc/rtc_base/thread_unittest.cc +++ b/webrtc/rtc_base/thread_unittest.cc @@ -10,14 +10,14 @@ #include -#include "webrtc/rtc_base/asyncinvoker.h" -#include "webrtc/rtc_base/asyncudpsocket.h" -#include "webrtc/rtc_base/event.h" -#include "webrtc/rtc_base/gunit.h" -#include "webrtc/rtc_base/physicalsocketserver.h" -#include "webrtc/rtc_base/sigslot.h" -#include "webrtc/rtc_base/socketaddress.h" -#include "webrtc/rtc_base/thread.h" +#include "webrtc/base/asyncinvoker.h" +#include "webrtc/base/asyncudpsocket.h" +#include "webrtc/base/event.h" +#include "webrtc/base/gunit.h" +#include "webrtc/base/physicalsocketserver.h" +#include "webrtc/base/sigslot.h" +#include "webrtc/base/socketaddress.h" +#include "webrtc/base/thread.h" #if defined(WEBRTC_WIN) #include // NOLINT diff --git a/webrtc/rtc_base/timedelta.h b/webrtc/rtc_base/timedelta.h index ae4bda4390..49008ba925 100644 --- a/webrtc/rtc_base/timedelta.h +++ b/webrtc/rtc_base/timedelta.h @@ -13,7 +13,7 @@ #include -#include "webrtc/rtc_base/timeutils.h" +#include "webrtc/base/timeutils.h" // Convenience class to convert between different units of relative time. // Stores time to precision of nanoseconds, as int64_t internally. diff --git a/webrtc/rtc_base/timestampaligner.cc b/webrtc/rtc_base/timestampaligner.cc index fdce141073..281da8f862 100644 --- a/webrtc/rtc_base/timestampaligner.cc +++ b/webrtc/rtc_base/timestampaligner.cc @@ -10,10 +10,10 @@ #include -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/logging.h" -#include "webrtc/rtc_base/timestampaligner.h" -#include "webrtc/rtc_base/timeutils.h" +#include "webrtc/base/checks.h" +#include "webrtc/base/logging.h" +#include "webrtc/base/timestampaligner.h" +#include "webrtc/base/timeutils.h" namespace rtc { diff --git a/webrtc/rtc_base/timestampaligner.h b/webrtc/rtc_base/timestampaligner.h index dde877c583..90db4b9962 100644 --- a/webrtc/rtc_base/timestampaligner.h +++ b/webrtc/rtc_base/timestampaligner.h @@ -13,7 +13,7 @@ #include -#include "webrtc/rtc_base/constructormagic.h" +#include "webrtc/base/constructormagic.h" namespace rtc { diff --git a/webrtc/rtc_base/timestampaligner_unittest.cc b/webrtc/rtc_base/timestampaligner_unittest.cc index 0c838aff73..a4c0e5a41f 100644 --- a/webrtc/rtc_base/timestampaligner_unittest.cc +++ b/webrtc/rtc_base/timestampaligner_unittest.cc @@ -13,9 +13,9 @@ #include #include -#include "webrtc/rtc_base/gunit.h" -#include "webrtc/rtc_base/random.h" -#include "webrtc/rtc_base/timestampaligner.h" +#include "webrtc/base/gunit.h" +#include "webrtc/base/random.h" +#include "webrtc/base/timestampaligner.h" namespace rtc { diff --git a/webrtc/rtc_base/timeutils.cc b/webrtc/rtc_base/timeutils.cc index 36f9d3fbc7..ee1415f4d2 100644 --- a/webrtc/rtc_base/timeutils.cc +++ b/webrtc/rtc_base/timeutils.cc @@ -26,8 +26,8 @@ #include #endif -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/timeutils.h" +#include "webrtc/base/checks.h" +#include "webrtc/base/timeutils.h" namespace rtc { diff --git a/webrtc/rtc_base/timeutils_unittest.cc b/webrtc/rtc_base/timeutils_unittest.cc index 5fd94365b1..bac26c162b 100644 --- a/webrtc/rtc_base/timeutils_unittest.cc +++ b/webrtc/rtc_base/timeutils_unittest.cc @@ -8,12 +8,12 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/rtc_base/timeutils.h" -#include "webrtc/rtc_base/event.h" -#include "webrtc/rtc_base/fakeclock.h" -#include "webrtc/rtc_base/gunit.h" -#include "webrtc/rtc_base/helpers.h" -#include "webrtc/rtc_base/thread.h" +#include "webrtc/base/event.h" +#include "webrtc/base/fakeclock.h" +#include "webrtc/base/gunit.h" +#include "webrtc/base/helpers.h" +#include "webrtc/base/thread.h" +#include "webrtc/base/timeutils.h" namespace rtc { diff --git a/webrtc/rtc_base/trace_event.h b/webrtc/rtc_base/trace_event.h index 98f6afae94..fd48eae974 100644 --- a/webrtc/rtc_base/trace_event.h +++ b/webrtc/rtc_base/trace_event.h @@ -8,7 +8,7 @@ #include -#include "webrtc/rtc_base/event_tracer.h" +#include "webrtc/base/event_tracer.h" #if defined(TRACE_EVENT0) #error "Another copy of trace_event.h has already been included." diff --git a/webrtc/rtc_base/transformadapter.cc b/webrtc/rtc_base/transformadapter.cc index 3243e6db4a..1f1a2a055c 100644 --- a/webrtc/rtc_base/transformadapter.cc +++ b/webrtc/rtc_base/transformadapter.cc @@ -8,11 +8,11 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/rtc_base/transformadapter.h" +#include "webrtc/base/transformadapter.h" #include -#include "webrtc/rtc_base/checks.h" +#include "webrtc/base/checks.h" namespace rtc { diff --git a/webrtc/rtc_base/transformadapter.h b/webrtc/rtc_base/transformadapter.h index 21e11ed453..081889901b 100644 --- a/webrtc/rtc_base/transformadapter.h +++ b/webrtc/rtc_base/transformadapter.h @@ -11,7 +11,7 @@ #ifndef WEBRTC_RTC_BASE_TRANSFORMADAPTER_H_ #define WEBRTC_RTC_BASE_TRANSFORMADAPTER_H_ -#include "webrtc/rtc_base/stream.h" +#include "webrtc/base/stream.h" namespace rtc { /////////////////////////////////////////////////////////////////////////////// diff --git a/webrtc/rtc_base/unittest_main.cc b/webrtc/rtc_base/unittest_main.cc index b7738c6a6e..2f8f52c32a 100644 --- a/webrtc/rtc_base/unittest_main.cc +++ b/webrtc/rtc_base/unittest_main.cc @@ -14,12 +14,12 @@ #include #endif -#include "webrtc/rtc_base/fileutils.h" -#include "webrtc/rtc_base/flags.h" -#include "webrtc/rtc_base/gunit.h" -#include "webrtc/rtc_base/logging.h" -#include "webrtc/rtc_base/ssladapter.h" -#include "webrtc/rtc_base/sslstreamadapter.h" +#include "webrtc/base/flags.h" +#include "webrtc/base/fileutils.h" +#include "webrtc/base/gunit.h" +#include "webrtc/base/logging.h" +#include "webrtc/base/ssladapter.h" +#include "webrtc/base/sslstreamadapter.h" #include "webrtc/test/field_trial.h" #include "webrtc/test/testsupport/fileutils.h" diff --git a/webrtc/rtc_base/unixfilesystem.cc b/webrtc/rtc_base/unixfilesystem.cc index 345c602bf8..4901412486 100644 --- a/webrtc/rtc_base/unixfilesystem.cc +++ b/webrtc/rtc_base/unixfilesystem.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/rtc_base/unixfilesystem.h" +#include "webrtc/base/unixfilesystem.h" #include #include @@ -20,7 +20,7 @@ #include #include #include -#include "webrtc/rtc_base/macutils.h" +#include "webrtc/base/macutils.h" #endif // WEBRTC_MAC && !defined(WEBRTC_IOS) #if defined(WEBRTC_POSIX) && !defined(WEBRTC_MAC) || defined(WEBRTC_IOS) @@ -44,12 +44,12 @@ #include #endif -#include "webrtc/rtc_base/arraysize.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/fileutils.h" -#include "webrtc/rtc_base/pathutils.h" -#include "webrtc/rtc_base/stream.h" -#include "webrtc/rtc_base/stringutils.h" +#include "webrtc/base/arraysize.h" +#include "webrtc/base/checks.h" +#include "webrtc/base/fileutils.h" +#include "webrtc/base/pathutils.h" +#include "webrtc/base/stream.h" +#include "webrtc/base/stringutils.h" #if defined(WEBRTC_MAC) // Defined in applefilesystem.mm. No header file to discourage use diff --git a/webrtc/rtc_base/unixfilesystem.h b/webrtc/rtc_base/unixfilesystem.h index 0ed36b4334..eb58a4df3a 100644 --- a/webrtc/rtc_base/unixfilesystem.h +++ b/webrtc/rtc_base/unixfilesystem.h @@ -13,7 +13,7 @@ #include -#include "webrtc/rtc_base/fileutils.h" +#include "webrtc/base/fileutils.h" namespace rtc { diff --git a/webrtc/rtc_base/virtualsocket_unittest.cc b/webrtc/rtc_base/virtualsocket_unittest.cc index b58bdd8e71..34ee036c8a 100644 --- a/webrtc/rtc_base/virtualsocket_unittest.cc +++ b/webrtc/rtc_base/virtualsocket_unittest.cc @@ -16,16 +16,16 @@ #include -#include "webrtc/rtc_base/arraysize.h" -#include "webrtc/rtc_base/fakeclock.h" -#include "webrtc/rtc_base/gunit.h" -#include "webrtc/rtc_base/logging.h" -#include "webrtc/rtc_base/ptr_util.h" -#include "webrtc/rtc_base/testclient.h" -#include "webrtc/rtc_base/testutils.h" -#include "webrtc/rtc_base/thread.h" -#include "webrtc/rtc_base/timeutils.h" -#include "webrtc/rtc_base/virtualsocketserver.h" +#include "webrtc/base/arraysize.h" +#include "webrtc/base/fakeclock.h" +#include "webrtc/base/gunit.h" +#include "webrtc/base/logging.h" +#include "webrtc/base/ptr_util.h" +#include "webrtc/base/testclient.h" +#include "webrtc/base/testutils.h" +#include "webrtc/base/thread.h" +#include "webrtc/base/timeutils.h" +#include "webrtc/base/virtualsocketserver.h" using namespace rtc; diff --git a/webrtc/rtc_base/virtualsocketserver.cc b/webrtc/rtc_base/virtualsocketserver.cc index e47b01bbcb..a7e2d30971 100644 --- a/webrtc/rtc_base/virtualsocketserver.cc +++ b/webrtc/rtc_base/virtualsocketserver.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/rtc_base/virtualsocketserver.h" +#include "webrtc/base/virtualsocketserver.h" #include #include @@ -18,13 +18,13 @@ #include #include -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/fakeclock.h" -#include "webrtc/rtc_base/logging.h" -#include "webrtc/rtc_base/physicalsocketserver.h" -#include "webrtc/rtc_base/socketaddresspair.h" -#include "webrtc/rtc_base/thread.h" -#include "webrtc/rtc_base/timeutils.h" +#include "webrtc/base/checks.h" +#include "webrtc/base/fakeclock.h" +#include "webrtc/base/logging.h" +#include "webrtc/base/physicalsocketserver.h" +#include "webrtc/base/socketaddresspair.h" +#include "webrtc/base/thread.h" +#include "webrtc/base/timeutils.h" namespace rtc { #if defined(WEBRTC_WIN) diff --git a/webrtc/rtc_base/virtualsocketserver.h b/webrtc/rtc_base/virtualsocketserver.h index a08bc0ce38..4de12c7de2 100644 --- a/webrtc/rtc_base/virtualsocketserver.h +++ b/webrtc/rtc_base/virtualsocketserver.h @@ -14,12 +14,12 @@ #include #include -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/constructormagic.h" -#include "webrtc/rtc_base/event.h" -#include "webrtc/rtc_base/fakeclock.h" -#include "webrtc/rtc_base/messagequeue.h" -#include "webrtc/rtc_base/socketserver.h" +#include "webrtc/base/checks.h" +#include "webrtc/base/constructormagic.h" +#include "webrtc/base/event.h" +#include "webrtc/base/fakeclock.h" +#include "webrtc/base/messagequeue.h" +#include "webrtc/base/socketserver.h" namespace rtc { diff --git a/webrtc/rtc_base/weak_ptr.cc b/webrtc/rtc_base/weak_ptr.cc index 3693a94e24..8a07a87b7d 100644 --- a/webrtc/rtc_base/weak_ptr.cc +++ b/webrtc/rtc_base/weak_ptr.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/rtc_base/weak_ptr.h" +#include "webrtc/base/weak_ptr.h" // The implementation is borrowed from chromium except that it does not // implement SupportsWeakPtr. diff --git a/webrtc/rtc_base/weak_ptr.h b/webrtc/rtc_base/weak_ptr.h index 0e82612ad5..62c97d96ba 100644 --- a/webrtc/rtc_base/weak_ptr.h +++ b/webrtc/rtc_base/weak_ptr.h @@ -15,9 +15,9 @@ #include -#include "webrtc/rtc_base/refcount.h" -#include "webrtc/rtc_base/scoped_ref_ptr.h" -#include "webrtc/rtc_base/sequenced_task_checker.h" +#include "webrtc/base/refcount.h" +#include "webrtc/base/scoped_ref_ptr.h" +#include "webrtc/base/sequenced_task_checker.h" // The implementation is borrowed from chromium except that it does not // implement SupportsWeakPtr. diff --git a/webrtc/rtc_base/weak_ptr_unittest.cc b/webrtc/rtc_base/weak_ptr_unittest.cc index d6da2346fa..a3cd1f839c 100644 --- a/webrtc/rtc_base/weak_ptr_unittest.cc +++ b/webrtc/rtc_base/weak_ptr_unittest.cc @@ -10,9 +10,9 @@ #include -#include "webrtc/rtc_base/gunit.h" -#include "webrtc/rtc_base/task_queue.h" -#include "webrtc/rtc_base/weak_ptr.h" +#include "webrtc/base/gunit.h" +#include "webrtc/base/task_queue.h" +#include "webrtc/base/weak_ptr.h" namespace rtc { diff --git a/webrtc/rtc_base/win32.cc b/webrtc/rtc_base/win32.cc index 276b74bbfe..89970ec3a9 100644 --- a/webrtc/rtc_base/win32.cc +++ b/webrtc/rtc_base/win32.cc @@ -8,17 +8,17 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/rtc_base/win32.h" +#include "webrtc/base/win32.h" #include #include #include -#include "webrtc/rtc_base/arraysize.h" -#include "webrtc/rtc_base/basictypes.h" -#include "webrtc/rtc_base/byteorder.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/logging.h" +#include "webrtc/base/arraysize.h" +#include "webrtc/base/basictypes.h" +#include "webrtc/base/byteorder.h" +#include "webrtc/base/checks.h" +#include "webrtc/base/logging.h" namespace rtc { diff --git a/webrtc/rtc_base/win32.h b/webrtc/rtc_base/win32.h index be1195e37d..b4c7646f0f 100644 --- a/webrtc/rtc_base/win32.h +++ b/webrtc/rtc_base/win32.h @@ -38,8 +38,8 @@ typedef struct _TOKEN_MANDATORY_LABEL { #include -#include "webrtc/rtc_base/basictypes.h" -#include "webrtc/rtc_base/stringutils.h" +#include "webrtc/base/stringutils.h" +#include "webrtc/base/basictypes.h" namespace rtc { diff --git a/webrtc/rtc_base/win32_unittest.cc b/webrtc/rtc_base/win32_unittest.cc index 831b4b315c..c41ca86694 100644 --- a/webrtc/rtc_base/win32_unittest.cc +++ b/webrtc/rtc_base/win32_unittest.cc @@ -10,9 +10,9 @@ #include -#include "webrtc/rtc_base/gunit.h" -#include "webrtc/rtc_base/nethelpers.h" -#include "webrtc/rtc_base/win32.h" +#include "webrtc/base/gunit.h" +#include "webrtc/base/nethelpers.h" +#include "webrtc/base/win32.h" #if !defined(WEBRTC_WIN) #error Only for Windows diff --git a/webrtc/rtc_base/win32filesystem.cc b/webrtc/rtc_base/win32filesystem.cc index 973280ebe9..5445140ef2 100644 --- a/webrtc/rtc_base/win32filesystem.cc +++ b/webrtc/rtc_base/win32filesystem.cc @@ -8,21 +8,21 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/rtc_base/win32filesystem.h" +#include "webrtc/base/win32filesystem.h" +#include "webrtc/base/win32.h" #include #include #include -#include "webrtc/rtc_base/win32.h" #include -#include "webrtc/rtc_base/arraysize.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/fileutils.h" -#include "webrtc/rtc_base/pathutils.h" -#include "webrtc/rtc_base/stream.h" -#include "webrtc/rtc_base/stringutils.h" +#include "webrtc/base/arraysize.h" +#include "webrtc/base/checks.h" +#include "webrtc/base/fileutils.h" +#include "webrtc/base/pathutils.h" +#include "webrtc/base/stream.h" +#include "webrtc/base/stringutils.h" // In several places in this file, we test the integrity level of the process // before calling GetLongPathName. We do this because calling GetLongPathName diff --git a/webrtc/rtc_base/win32securityerrors.cc b/webrtc/rtc_base/win32securityerrors.cc index 0cc9bce7e6..71fe466a90 100644 --- a/webrtc/rtc_base/win32securityerrors.cc +++ b/webrtc/rtc_base/win32securityerrors.cc @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/rtc_base/logging.h" -#include "webrtc/rtc_base/win32.h" +#include "webrtc/base/win32.h" +#include "webrtc/base/logging.h" namespace rtc { diff --git a/webrtc/rtc_base/win32socketinit.cc b/webrtc/rtc_base/win32socketinit.cc index 1a54c444d0..02a6c26f40 100644 --- a/webrtc/rtc_base/win32socketinit.cc +++ b/webrtc/rtc_base/win32socketinit.cc @@ -8,9 +8,9 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/rtc_base/win32socketinit.h" +#include "webrtc/base/win32socketinit.h" -#include "webrtc/rtc_base/win32.h" +#include "webrtc/base/win32.h" namespace rtc { diff --git a/webrtc/rtc_base/win32socketserver.cc b/webrtc/rtc_base/win32socketserver.cc index 1405c82ace..daec986313 100644 --- a/webrtc/rtc_base/win32socketserver.cc +++ b/webrtc/rtc_base/win32socketserver.cc @@ -8,15 +8,15 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/rtc_base/win32socketserver.h" +#include "webrtc/base/win32socketserver.h" #include #include // NOLINT -#include "webrtc/rtc_base/byteorder.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/logging.h" -#include "webrtc/rtc_base/win32window.h" +#include "webrtc/base/byteorder.h" +#include "webrtc/base/checks.h" +#include "webrtc/base/logging.h" +#include "webrtc/base/win32window.h" namespace rtc { diff --git a/webrtc/rtc_base/win32socketserver.h b/webrtc/rtc_base/win32socketserver.h index 1255a80e3d..adb621c7a3 100644 --- a/webrtc/rtc_base/win32socketserver.h +++ b/webrtc/rtc_base/win32socketserver.h @@ -12,14 +12,14 @@ #define WEBRTC_RTC_BASE_WIN32SOCKETSERVER_H_ #if defined(WEBRTC_WIN) -#include "webrtc/rtc_base/asyncsocket.h" -#include "webrtc/rtc_base/criticalsection.h" -#include "webrtc/rtc_base/messagequeue.h" -#include "webrtc/rtc_base/socket.h" -#include "webrtc/rtc_base/socketfactory.h" -#include "webrtc/rtc_base/socketserver.h" -#include "webrtc/rtc_base/thread.h" -#include "webrtc/rtc_base/win32window.h" +#include "webrtc/base/asyncsocket.h" +#include "webrtc/base/criticalsection.h" +#include "webrtc/base/messagequeue.h" +#include "webrtc/base/socketserver.h" +#include "webrtc/base/socketfactory.h" +#include "webrtc/base/socket.h" +#include "webrtc/base/thread.h" +#include "webrtc/base/win32window.h" namespace rtc { diff --git a/webrtc/rtc_base/win32socketserver_unittest.cc b/webrtc/rtc_base/win32socketserver_unittest.cc index 9eacff774a..7211cd7f7f 100644 --- a/webrtc/rtc_base/win32socketserver_unittest.cc +++ b/webrtc/rtc_base/win32socketserver_unittest.cc @@ -7,10 +7,10 @@ * in the file PATENTS. All contributing project authors may * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/rtc_base/win32socketserver.h" -#include "webrtc/rtc_base/gunit.h" -#include "webrtc/rtc_base/socket_unittest.h" -#include "webrtc/rtc_base/thread.h" +#include "webrtc/base/gunit.h" +#include "webrtc/base/socket_unittest.h" +#include "webrtc/base/thread.h" +#include "webrtc/base/win32socketserver.h" namespace rtc { diff --git a/webrtc/rtc_base/win32window.cc b/webrtc/rtc_base/win32window.cc index e005ba1516..0e02eef1dc 100644 --- a/webrtc/rtc_base/win32window.cc +++ b/webrtc/rtc_base/win32window.cc @@ -8,9 +8,9 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/rtc_base/win32window.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/logging.h" +#include "webrtc/base/checks.h" +#include "webrtc/base/logging.h" +#include "webrtc/base/win32window.h" namespace rtc { diff --git a/webrtc/rtc_base/win32window.h b/webrtc/rtc_base/win32window.h index a9fe8437d6..2243a52e0b 100644 --- a/webrtc/rtc_base/win32window.h +++ b/webrtc/rtc_base/win32window.h @@ -13,7 +13,7 @@ #if defined(WEBRTC_WIN) -#include "webrtc/rtc_base/win32.h" +#include "webrtc/base/win32.h" namespace rtc { diff --git a/webrtc/rtc_base/win32window_unittest.cc b/webrtc/rtc_base/win32window_unittest.cc index 9bd2d34c9b..f814752e39 100644 --- a/webrtc/rtc_base/win32window_unittest.cc +++ b/webrtc/rtc_base/win32window_unittest.cc @@ -8,9 +8,9 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/rtc_base/win32window.h" -#include "webrtc/rtc_base/gunit.h" -#include "webrtc/rtc_base/logging.h" +#include "webrtc/base/gunit.h" +#include "webrtc/base/win32window.h" +#include "webrtc/base/logging.h" static LRESULT kDummyResult = 0x1234ABCD; diff --git a/webrtc/rtc_base/window.h b/webrtc/rtc_base/window.h index 10ed9f7a95..2eed4beafd 100644 --- a/webrtc/rtc_base/window.h +++ b/webrtc/rtc_base/window.h @@ -13,14 +13,14 @@ #include -#include "webrtc/rtc_base/stringencode.h" +#include "webrtc/base/stringencode.h" // Define platform specific window types. #if defined(WEBRTC_LINUX) && !defined(WEBRTC_ANDROID) typedef unsigned long Window; // Avoid include . #elif defined(WEBRTC_WIN) -// We commonly include win32.h in webrtc/rtc_base so just include it here. -#include "webrtc/rtc_base/win32.h" // Include HWND, HMONITOR. +// We commonly include win32.h in webrtc/base so just include it here. +#include "webrtc/base/win32.h" // Include HWND, HMONITOR. #elif defined(WEBRTC_MAC) && !defined(WEBRTC_IOS) typedef unsigned int CGWindowID; typedef unsigned int CGDirectDisplayID;