Revert of Replace basictypes.h with stdint.h for int_t types. (patchset #1 id:1 of https://codereview.webrtc.org/2604043002/ )
Reason for revert:
Very likely cause of Chromium import bot breakage (unused function '__cpuid'), TBD why.
Original issue's description:
> Replace basictypes.h with stdint.h for int_t types.
>
> Removes basictypes.h for types that only makes use of it for fixed-size-int
> typedefs and replaces it with stdint.h.
>
> BUG=webrtc:6853
> R=tommi@webrtc.org
>
> Review-Url: https://codereview.webrtc.org/2604043002
> Cr-Commit-Position: refs/heads/master@{#15867}
> Committed: https://chromium.googlesource.com/external/webrtc/+/7fd1a753005ca93e8bd934a55808a2137b0ad84f
TBR=tommi@webrtc.org
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=webrtc:6853
Review-Url: https://codereview.webrtc.org/2603203003
Cr-Commit-Position: refs/heads/master@{#15869}
diff --git a/webrtc/api/rtpreceiver.h b/webrtc/api/rtpreceiver.h
index b6807c4..4b3bd4d 100644
--- a/webrtc/api/rtpreceiver.h
+++ b/webrtc/api/rtpreceiver.h
@@ -15,14 +15,13 @@
#ifndef WEBRTC_API_RTPRECEIVER_H_
#define WEBRTC_API_RTPRECEIVER_H_
-#include <stdint.h>
-
#include <string>
#include "webrtc/api/mediastreaminterface.h"
#include "webrtc/api/rtpreceiverinterface.h"
#include "webrtc/api/remoteaudiosource.h"
#include "webrtc/api/videotracksource.h"
+#include "webrtc/base/basictypes.h"
#include "webrtc/base/sigslot.h"
#include "webrtc/media/base/videobroadcaster.h"
#include "webrtc/pc/channel.h"
diff --git a/webrtc/base/byteorder_unittest.cc b/webrtc/base/byteorder_unittest.cc
index 6d9b44f..c3135aa 100644
--- a/webrtc/base/byteorder_unittest.cc
+++ b/webrtc/base/byteorder_unittest.cc
@@ -8,9 +8,9 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include <stdint.h>
-
#include "webrtc/base/byteorder.h"
+
+#include "webrtc/base/basictypes.h"
#include "webrtc/base/gunit.h"
namespace rtc {
diff --git a/webrtc/base/network.h b/webrtc/base/network.h
index 52d7d35..623ead0 100644
--- a/webrtc/base/network.h
+++ b/webrtc/base/network.h
@@ -11,14 +11,13 @@
#ifndef WEBRTC_BASE_NETWORK_H_
#define WEBRTC_BASE_NETWORK_H_
-#include <stdint.h>
-
#include <deque>
#include <map>
#include <memory>
#include <string>
#include <vector>
+#include "webrtc/base/basictypes.h"
#include "webrtc/base/ipaddress.h"
#include "webrtc/base/networkmonitor.h"
#include "webrtc/base/messagehandler.h"
diff --git a/webrtc/base/rtccertificate.h b/webrtc/base/rtccertificate.h
index dfc7680..2417020 100644
--- a/webrtc/base/rtccertificate.h
+++ b/webrtc/base/rtccertificate.h
@@ -11,10 +11,9 @@
#ifndef WEBRTC_BASE_RTCCERTIFICATE_H_
#define WEBRTC_BASE_RTCCERTIFICATE_H_
-#include <stdint.h>
-
#include <memory>
+#include "webrtc/base/basictypes.h"
#include "webrtc/base/refcount.h"
#include "webrtc/base/scoped_ref_ptr.h"
#include "webrtc/base/sslidentity.h"
diff --git a/webrtc/base/systeminfo.h b/webrtc/base/systeminfo.h
index 2e5a0a1..99d18b2 100644
--- a/webrtc/base/systeminfo.h
+++ b/webrtc/base/systeminfo.h
@@ -11,10 +11,10 @@
#ifndef WEBRTC_BASE_SYSTEMINFO_H__
#define WEBRTC_BASE_SYSTEMINFO_H__
-#include <stdint.h>
-
#include <string>
+#include "webrtc/base/basictypes.h"
+
namespace rtc {
class SystemInfo {
diff --git a/webrtc/base/task.h b/webrtc/base/task.h
index 4d54cfe..b2a6067 100644
--- a/webrtc/base/task.h
+++ b/webrtc/base/task.h
@@ -11,10 +11,8 @@
#ifndef WEBRTC_BASE_TASK_H__
#define WEBRTC_BASE_TASK_H__
-#include <stdint.h>
-
#include <string>
-
+#include "webrtc/base/basictypes.h"
#include "webrtc/base/sigslot.h"
#include "webrtc/base/taskparent.h"
diff --git a/webrtc/base/taskrunner.h b/webrtc/base/taskrunner.h
index bd7b4ea..e0cf175 100644
--- a/webrtc/base/taskrunner.h
+++ b/webrtc/base/taskrunner.h
@@ -11,10 +11,9 @@
#ifndef WEBRTC_BASE_TASKRUNNER_H__
#define WEBRTC_BASE_TASKRUNNER_H__
-#include <stdint.h>
-
#include <vector>
+#include "webrtc/base/basictypes.h"
#include "webrtc/base/sigslot.h"
#include "webrtc/base/taskparent.h"
diff --git a/webrtc/base/timedelta.h b/webrtc/base/timedelta.h
index 71c7f9f..fe8e6aa 100644
--- a/webrtc/base/timedelta.h
+++ b/webrtc/base/timedelta.h
@@ -11,8 +11,7 @@
#ifndef WEBRTC_BASE_TIMEDELTA_H_
#define WEBRTC_BASE_TIMEDELTA_H_
-#include <stdint.h>
-
+#include "webrtc/base/basictypes.h"
#include "webrtc/base/timeutils.h"
// Convenience class to convert between different units of relative time.
diff --git a/webrtc/base/timestampaligner.h b/webrtc/base/timestampaligner.h
index 9c2cc7a..590499d 100644
--- a/webrtc/base/timestampaligner.h
+++ b/webrtc/base/timestampaligner.h
@@ -11,8 +11,7 @@
#ifndef WEBRTC_BASE_TIMESTAMPALIGNER_H_
#define WEBRTC_BASE_TIMESTAMPALIGNER_H_
-#include <stdint.h>
-
+#include "webrtc/base/basictypes.h"
#include "webrtc/base/constructormagic.h"
namespace rtc {
diff --git a/webrtc/base/timeutils.h b/webrtc/base/timeutils.h
index be9edab..f41bbb5 100644
--- a/webrtc/base/timeutils.h
+++ b/webrtc/base/timeutils.h
@@ -11,10 +11,10 @@
#ifndef WEBRTC_BASE_TIMEUTILS_H_
#define WEBRTC_BASE_TIMEUTILS_H_
-#include <stdint.h>
+#include <ctime>
#include <time.h>
-#include <ctime>
+#include "webrtc/base/basictypes.h"
namespace rtc {
diff --git a/webrtc/base/window.h b/webrtc/base/window.h
index e5b5d50..b1f1724 100644
--- a/webrtc/base/window.h
+++ b/webrtc/base/window.h
@@ -11,8 +11,7 @@
#ifndef WEBRTC_BASE_WINDOW_H_
#define WEBRTC_BASE_WINDOW_H_
-#include <stdint.h>
-
+#include "webrtc/base/basictypes.h"
#include "webrtc/base/stringencode.h"
// Define platform specific window types.
diff --git a/webrtc/call/flexfec_receive_stream.h b/webrtc/call/flexfec_receive_stream.h
index fe57643..20a57f2 100644
--- a/webrtc/call/flexfec_receive_stream.h
+++ b/webrtc/call/flexfec_receive_stream.h
@@ -11,8 +11,6 @@
#ifndef WEBRTC_CALL_FLEXFEC_RECEIVE_STREAM_H_
#define WEBRTC_CALL_FLEXFEC_RECEIVE_STREAM_H_
-#include <stdint.h>
-
#include <string>
#include <vector>
diff --git a/webrtc/call/flexfec_receive_stream_unittest.cc b/webrtc/call/flexfec_receive_stream_unittest.cc
index c25858f..07d3943 100644
--- a/webrtc/call/flexfec_receive_stream_unittest.cc
+++ b/webrtc/call/flexfec_receive_stream_unittest.cc
@@ -8,9 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include <stdint.h>
-
#include "webrtc/base/array_view.h"
+#include "webrtc/base/basictypes.h"
#include "webrtc/call/flexfec_receive_stream_impl.h"
#include "webrtc/modules/rtp_rtcp/include/flexfec_receiver.h"
#include "webrtc/modules/rtp_rtcp/source/byte_io.h"
diff --git a/webrtc/examples/peerconnection/client/defaults.h b/webrtc/examples/peerconnection/client/defaults.h
index ecfb9ba..f4d3bf5 100644
--- a/webrtc/examples/peerconnection/client/defaults.h
+++ b/webrtc/examples/peerconnection/client/defaults.h
@@ -12,10 +12,10 @@
#define WEBRTC_EXAMPLES_PEERCONNECTION_CLIENT_DEFAULTS_H_
#pragma once
-#include <stdint.h>
-
#include <string>
+#include "webrtc/base/basictypes.h"
+
extern const char kAudioLabel[];
extern const char kVideoLabel[];
extern const char kStreamLabel[];
diff --git a/webrtc/media/base/streamparams.h b/webrtc/media/base/streamparams.h
index 75d8280..a2d48c5 100644
--- a/webrtc/media/base/streamparams.h
+++ b/webrtc/media/base/streamparams.h
@@ -26,13 +26,12 @@
#ifndef WEBRTC_MEDIA_BASE_STREAMPARAMS_H_
#define WEBRTC_MEDIA_BASE_STREAMPARAMS_H_
-#include <stdint.h>
-
#include <algorithm>
#include <set>
#include <string>
#include <vector>
+#include "webrtc/base/basictypes.h"
#include "webrtc/base/constructormagic.h"
namespace cricket {
diff --git a/webrtc/media/base/videocapturer.h b/webrtc/media/base/videocapturer.h
index 76ab95a..1f1da3a 100644
--- a/webrtc/media/base/videocapturer.h
+++ b/webrtc/media/base/videocapturer.h
@@ -13,13 +13,12 @@
#ifndef WEBRTC_MEDIA_BASE_VIDEOCAPTURER_H_
#define WEBRTC_MEDIA_BASE_VIDEOCAPTURER_H_
-#include <stdint.h>
-
#include <algorithm>
#include <memory>
#include <string>
#include <vector>
+#include "webrtc/base/basictypes.h"
#include "webrtc/base/constructormagic.h"
#include "webrtc/base/criticalsection.h"
#include "webrtc/media/base/videosourceinterface.h"
diff --git a/webrtc/media/base/videocommon.h b/webrtc/media/base/videocommon.h
index 47cfb85..757100b 100644
--- a/webrtc/media/base/videocommon.h
+++ b/webrtc/media/base/videocommon.h
@@ -13,10 +13,9 @@
#ifndef WEBRTC_MEDIA_BASE_VIDEOCOMMON_H_ // NOLINT
#define WEBRTC_MEDIA_BASE_VIDEOCOMMON_H_
-#include <stdint.h>
-
#include <string>
+#include "webrtc/base/basictypes.h"
#include "webrtc/base/timeutils.h"
namespace cricket {
diff --git a/webrtc/media/devices/gtkvideorenderer.h b/webrtc/media/devices/gtkvideorenderer.h
index 7e2c7ce..63a3ea9 100644
--- a/webrtc/media/devices/gtkvideorenderer.h
+++ b/webrtc/media/devices/gtkvideorenderer.h
@@ -14,10 +14,9 @@
#ifndef WEBRTC_MEDIA_DEVICES_GTKVIDEORENDERER_H_
#define WEBRTC_MEDIA_DEVICES_GTKVIDEORENDERER_H_
-#include <stdint.h>
-
#include <memory>
+#include "webrtc/base/basictypes.h"
#include "webrtc/media/base/videosinkinterface.h"
typedef struct _GtkWidget GtkWidget; // forward declaration, defined in gtk.h
diff --git a/webrtc/modules/rtp_rtcp/source/playout_delay_oracle.h b/webrtc/modules/rtp_rtcp/source/playout_delay_oracle.h
index 013d1c1..f4cbe52 100644
--- a/webrtc/modules/rtp_rtcp/source/playout_delay_oracle.h
+++ b/webrtc/modules/rtp_rtcp/source/playout_delay_oracle.h
@@ -11,8 +11,7 @@
#ifndef WEBRTC_MODULES_RTP_RTCP_SOURCE_PLAYOUT_DELAY_ORACLE_H_
#define WEBRTC_MODULES_RTP_RTCP_SOURCE_PLAYOUT_DELAY_ORACLE_H_
-#include <stdint.h>
-
+#include "webrtc/base/basictypes.h"
#include "webrtc/base/criticalsection.h"
#include "webrtc/base/thread_annotations.h"
#include "webrtc/modules/include/module_common_types.h"
diff --git a/webrtc/modules/rtp_rtcp/source/rtp_header_extensions.h b/webrtc/modules/rtp_rtcp/source/rtp_header_extensions.h
index 56e4c15..afe47e5 100644
--- a/webrtc/modules/rtp_rtcp/source/rtp_header_extensions.h
+++ b/webrtc/modules/rtp_rtcp/source/rtp_header_extensions.h
@@ -10,8 +10,7 @@
#ifndef WEBRTC_MODULES_RTP_RTCP_SOURCE_RTP_HEADER_EXTENSIONS_H_
#define WEBRTC_MODULES_RTP_RTCP_SOURCE_RTP_HEADER_EXTENSIONS_H_
-#include <stdint.h>
-
+#include "webrtc/base/basictypes.h"
#include "webrtc/common_video/rotation.h"
#include "webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h"
diff --git a/webrtc/modules/rtp_rtcp/source/time_util.h b/webrtc/modules/rtp_rtcp/source/time_util.h
index 7bac526..5a9525a 100644
--- a/webrtc/modules/rtp_rtcp/source/time_util.h
+++ b/webrtc/modules/rtp_rtcp/source/time_util.h
@@ -11,8 +11,7 @@
#ifndef WEBRTC_MODULES_RTP_RTCP_SOURCE_TIME_UTIL_H_
#define WEBRTC_MODULES_RTP_RTCP_SOURCE_TIME_UTIL_H_
-#include <stdint.h>
-
+#include "webrtc/base/basictypes.h"
#include "webrtc/system_wrappers/include/ntp_time.h"
namespace webrtc {
diff --git a/webrtc/modules/video_coding/h264_sprop_parameter_sets_unittest.cc b/webrtc/modules/video_coding/h264_sprop_parameter_sets_unittest.cc
index 6455670..29b6617 100644
--- a/webrtc/modules/video_coding/h264_sprop_parameter_sets_unittest.cc
+++ b/webrtc/modules/video_coding/h264_sprop_parameter_sets_unittest.cc
@@ -10,10 +10,8 @@
#include "webrtc/modules/video_coding/h264_sprop_parameter_sets.h"
-#include <stdint.h>
-
#include <vector>
-
+#include "webrtc/base/basictypes.h"
#include "webrtc/test/gtest.h"
namespace webrtc {
diff --git a/webrtc/modules/video_coding/utility/default_video_bitrate_allocator.cc b/webrtc/modules/video_coding/utility/default_video_bitrate_allocator.cc
index 482c8ec..cb701f2 100644
--- a/webrtc/modules/video_coding/utility/default_video_bitrate_allocator.cc
+++ b/webrtc/modules/video_coding/utility/default_video_bitrate_allocator.cc
@@ -9,8 +9,8 @@
*/
#include "webrtc/modules/video_coding/utility/default_video_bitrate_allocator.h"
-
-#include <stdint.h>
+#include "webrtc/base/basictypes.h"
+#include "webrtc/base/constructormagic.h"
namespace webrtc {
diff --git a/webrtc/modules/video_coding/utility/simulcast_rate_allocator.h b/webrtc/modules/video_coding/utility/simulcast_rate_allocator.h
index 7f54f5c..149e866 100644
--- a/webrtc/modules/video_coding/utility/simulcast_rate_allocator.h
+++ b/webrtc/modules/video_coding/utility/simulcast_rate_allocator.h
@@ -11,11 +11,10 @@
#ifndef WEBRTC_MODULES_VIDEO_CODING_UTILITY_SIMULCAST_RATE_ALLOCATOR_H_
#define WEBRTC_MODULES_VIDEO_CODING_UTILITY_SIMULCAST_RATE_ALLOCATOR_H_
-#include <stdint.h>
-
#include <map>
#include <memory>
+#include "webrtc/base/basictypes.h"
#include "webrtc/base/constructormagic.h"
#include "webrtc/common_video/include/video_bitrate_allocator.h"
#include "webrtc/modules/video_coding/codecs/vp8/temporal_layers.h"
diff --git a/webrtc/p2p/base/candidate.h b/webrtc/p2p/base/candidate.h
index 22d87b5..4eb05f0 100644
--- a/webrtc/p2p/base/candidate.h
+++ b/webrtc/p2p/base/candidate.h
@@ -13,7 +13,6 @@
#include <limits.h>
#include <math.h>
-#include <stdint.h>
#include <algorithm>
#include <iomanip>
@@ -21,6 +20,7 @@
#include <string>
#include "webrtc/p2p/base/p2pconstants.h"
+#include "webrtc/base/basictypes.h"
#include "webrtc/base/helpers.h"
#include "webrtc/base/network.h"
#include "webrtc/base/socketaddress.h"
diff --git a/webrtc/p2p/stunprober/stunprober_unittest.cc b/webrtc/p2p/stunprober/stunprober_unittest.cc
index e194e4f..f5ee4bf 100644
--- a/webrtc/p2p/stunprober/stunprober_unittest.cc
+++ b/webrtc/p2p/stunprober/stunprober_unittest.cc
@@ -8,11 +8,10 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include <stdint.h>
-
#include <memory>
#include "webrtc/base/asyncresolverinterface.h"
+#include "webrtc/base/basictypes.h"
#include "webrtc/base/bind.h"
#include "webrtc/base/checks.h"
#include "webrtc/base/gunit.h"
diff --git a/webrtc/pc/currentspeakermonitor.h b/webrtc/pc/currentspeakermonitor.h
index 14ed876..730ded0 100644
--- a/webrtc/pc/currentspeakermonitor.h
+++ b/webrtc/pc/currentspeakermonitor.h
@@ -14,10 +14,9 @@
#ifndef WEBRTC_PC_CURRENTSPEAKERMONITOR_H_
#define WEBRTC_PC_CURRENTSPEAKERMONITOR_H_
-#include <stdint.h>
-
#include <map>
+#include "webrtc/base/basictypes.h"
#include "webrtc/base/sigslot.h"
namespace cricket {
diff --git a/webrtc/pc/externalhmac.h b/webrtc/pc/externalhmac.h
index 2666d90..f9f1a2c 100644
--- a/webrtc/pc/externalhmac.h
+++ b/webrtc/pc/externalhmac.h
@@ -28,8 +28,7 @@
// functions and the corresponding authentication id using
// crypto_kernel_replace_auth_type function.
-#include <stdint.h>
-
+#include "webrtc/base/basictypes.h"
#ifdef HAVE_SRTP
#include "third_party/libsrtp/crypto/include/auth.h"
#endif // HAVE_SRTP
diff --git a/webrtc/sdk/android/src/jni/androidnetworkmonitor_jni.h b/webrtc/sdk/android/src/jni/androidnetworkmonitor_jni.h
index 8df778e..1e40341 100644
--- a/webrtc/sdk/android/src/jni/androidnetworkmonitor_jni.h
+++ b/webrtc/sdk/android/src/jni/androidnetworkmonitor_jni.h
@@ -13,11 +13,10 @@
#include "webrtc/base/networkmonitor.h"
-#include <stdint.h>
-
#include <map>
#include "webrtc/sdk/android/src/jni/jni_helpers.h"
+#include "webrtc/base/basictypes.h"
#include "webrtc/base/thread_checker.h"
namespace webrtc_jni {
diff --git a/webrtc/system_wrappers/include/ntp_time.h b/webrtc/system_wrappers/include/ntp_time.h
index 9c55419..229666e 100644
--- a/webrtc/system_wrappers/include/ntp_time.h
+++ b/webrtc/system_wrappers/include/ntp_time.h
@@ -10,8 +10,7 @@
#ifndef WEBRTC_SYSTEM_WRAPPERS_INCLUDE_NTP_TIME_H_
#define WEBRTC_SYSTEM_WRAPPERS_INCLUDE_NTP_TIME_H_
-#include <stdint.h>
-
+#include "webrtc/base/basictypes.h"
#include "webrtc/system_wrappers/include/clock.h"
namespace webrtc {
diff --git a/webrtc/test/frame_utils.h b/webrtc/test/frame_utils.h
index 8600f43..28a7e45 100644
--- a/webrtc/test/frame_utils.h
+++ b/webrtc/test/frame_utils.h
@@ -10,8 +10,7 @@
#ifndef WEBRTC_TEST_FRAME_UTILS_H_
#define WEBRTC_TEST_FRAME_UTILS_H_
-#include <stdint.h>
-
+#include "webrtc/base/basictypes.h"
#include "webrtc/base/scoped_ref_ptr.h"
namespace webrtc {
