commit 0cc2fe5e78c6eda8dc936e25b7cf256c04941cc1
author Niels Möller <nisse@webrtc.org> Fri Mar 22 13:25:57 2019
committer Commit Bot <commit-bot@chromium.org> Wed Mar 27 13:49:07 2019
tree 3218edfff0c590644cd6b18e9114a888a271de85
parent 53dd1f3c1a330bab49880f5a044f4b790c85e91a

Delete transitional includes from common_types.h

Also drop unneeded dependencies and a #pragma.

Bug: webrtc:5876, webrtc:7660
Change-Id: I3a46eaf60591b00e43c0647a6eb758e5443de466
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/128773
Reviewed-by: Karl Wiberg <kwiberg@webrtc.org>
Commit-Queue: Niels Moller <nisse@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#27311}

BUILD.gn

diff --git a/BUILD.gn b/BUILD.gn
index 188a70e..f1ac0bb 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -447,14 +447,6 @@
   sources = [
     "common_types.h",
   ]
-  deps = [
-    "api:array_view",
-    "api/video:video_frame",
-    "modules/audio_coding:audio_coding_module_typedefs",
-    "rtc_base:checks",
-    "rtc_base:deprecation",
-    "//third_party/abseil-cpp/absl/strings",
-  ]
 }
 
 if (use_libfuzzer || use_afl) {

DEPS

diff --git a/DEPS b/DEPS
index 9abf5ea..e428d18 100644
--- a/DEPS
+++ b/DEPS
@@ -1632,11 +1632,3 @@
   "+absl/types/optional.h",
   "+absl/types/variant.h",
 ]
-
-specific_include_rules = {
-  "common_types\.h" : [
-    # TODO(bugs.webrtc.org/5876). For migration of AudioFrameType.
-    # Delete when downstream code is updated.
-    "+modules/audio_coding/include/audio_coding_module_typedefs.h"
-  ],
-}

common_types.h

diff --git a/common_types.h b/common_types.h
index 3caf155..f93769c 100644
--- a/common_types.h
+++ b/common_types.h
@@ -14,18 +14,6 @@
 #include <stddef.h>  // For size_t
 #include <cstdint>
 
-// TODO(bugs.webrtc.org/7660): Delete include once downstream code is updated.
-#include "api/video/video_codec_type.h"
-// TODO(bugs.webrtc.org/5876): For AudioFrameType. Delete when downstream code
-// is updated.
-#include "modules/audio_coding/include/audio_coding_module_typedefs.h"
-
-#if defined(_MSC_VER)
-// Disable "new behavior: elements of array will be default initialized"
-// warning. Affects OverUseDetectorOptions.
-#pragma warning(disable : 4351)
-#endif
-
 namespace webrtc {
 
 // Statistics for RTCP packet types.

test/scenario/scenario_config.h

diff --git a/test/scenario/scenario_config.h b/test/scenario/scenario_config.h
index 5532dba..e62c610 100644
--- a/test/scenario/scenario_config.h
+++ b/test/scenario/scenario_config.h
@@ -19,6 +19,7 @@
 #include "api/units/data_rate.h"
 #include "api/units/data_size.h"
 #include "api/units/time_delta.h"
+#include "api/video/video_codec_type.h"
 #include "common_types.h"  // NOLINT(build/include)
 #include "test/frame_generator.h"
 #include "test/scenario/quality_info.h"